alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
563 Commits 12 Branches 0 Tags 17 MiB
Commit Graph

563 Commits

Author SHA1 Message Date
Harry Bomrah 25bf24745c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 18:01:00 +08:00
Harry Bomrah 2432a587d5 css mods for archive 2015-03-18 17:59:36 +08:00
Harry Bomrah 7d6fdc2559 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 15:43:23 +08:00
Harry Bomrah fb8c8d4526 fixed omniauth 2015-03-18 15:41:24 +08:00
Harry Bomrah 366876ae29 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
 2015-03-13 17:10:52 +08:00
Harry Bomrah 52c78856be added insert new widgets to kernel 2015-03-13 16:39:09 +08:00
Harry Bomrah c4be6c5f63 visibility of group fixed 2015-03-12 19:05:49 +08:00
Harry Bomrah f71b5d6bbb groups started 2015-03-12 19:02:48 +08:00
rulingcom 16dae228b1 sdk updates from joshua 2015-03-11 16:18:56 +08:00
nccu 4870fc5ad3 help designer 2015-03-09 11:12:20 +08:00
Harry Bomrah 9be667d405 removed desktop 2015-03-06 18:03:43 +08:00
rulingcom e045025bc6 precompile fixes for orbit mobile template 2015-03-06 17:59:30 +08:00
rulingcom 7aa187497a sdk changes by joshua wq 2015-03-06 17:21:38 +08:00
Harry Bomrah dfd7865bd5 new error and success pages for google auth and also spinner fixed for update manager 2015-03-06 17:13:09 +08:00
manson 470d1b2405 display calendar 2015-03-06 12:41:51 +08:00
nccu 8d3d086629 fix search word 2015-03-06 12:39:30 +08:00
manson eaa63cc5aa enable calendar 2015-03-06 12:34:54 +08:00
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
nccu 007a46a373 help designer fix 2015-03-06 10:49:48 +08:00
Harry Bomrah e881d02bee fix 2015-03-04 20:43:01 +08:00
Harry Bomrah b53a7508f5 again small fix for js 
Conflicts:
	app/views/admin/members/show.html.erb
 2015-03-04 20:37:44 +08:00
Harry Bomrah 8e7319b3c3 fixed js 2015-03-04 20:31:33 +08:00
Harry Bomrah 2942ab8563 small fix in js for google connect 2015-03-04 20:17:39 +08:00
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +08:00
Harry Bomrah 2d1f9cb1ab Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-02-26 14:56:06 +05:30
Harry Bomrah 5773d49218 small fix for datepicker 2015-02-26 14:53:55 +05:30
Harry Bomrah 3e1032f801 fixed date and time for announcement and news 2015-02-26 14:53:55 +05:30
Ray eb21f6535c store css 2015-02-26 15:11:38 +08:00
Ray 5f90be20a2 update Templates storn & Module storn UI 2015-02-26 15:09:42 +08:00
Ray d64dc336a5 use CDN 
change jquery, Bootstrap and font-awesome url to CDN
 2015-02-26 15:06:45 +08:00
Ray aef48fe890 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-02-26 15:01:31 +08:00
Ray f3e9679e54 增加右上角的新增按鈕 
使用方式是當 render filter 在最後放個 true
範例：<%=  render_filter @filter_fields, "index_table", true %>
 2015-02-26 15:01:06 +08:00
nccu 95da400843 help designer to push code 2015-02-25 11:41:53 +08:00
JiangRu 17213fb41f if no data , hide title&table 2015-02-25 11:06:58 +08:00
nccu f41f128154 fix by Designer 2015-02-24 14:19:36 +08:00
Harry Bomrah 8c0d94c00a Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-02-09 15:13:52 +05:30
Harry Bomrah 9862722252 url fixed for license 2015-02-09 15:09:16 +05:30
manson 1aa5739380 add all JS and CSS to precompile 2015-02-06 18:05:05 +08:00
manson 0c62c4b994 fix development mode not using precompiled aseets 2015-02-06 17:36:37 +08:00
nccu 66bc09094c add insert translate 2015-01-27 16:52:34 +08:00
Harry Bomrah e1247e6083 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-20 14:24:17 +05:30
spen e616c4b947 fix member pic name 2015-01-20 15:27:43 +08:00
Harry Bomrah 1b4e975548 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-12 12:25:20 +05:30
Harry Bomrah 35e203c476 fix 2015-01-12 12:24:28 +05:30
Harry Bomrah 4fd0e2d315 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-12 12:20:52 +05:30
Harry Bomrah 3532ec67a9 some error fixed for checking permissions 2015-01-12 12:19:52 +05:30
Harry Bomrah 9be7e13774 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-12 11:54:52 +05:30
Harry Bomrah 328277394d fix for rake... 2015-01-12 11:53:29 +05:30
Harry Bomrah 5b570fe8a1 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-09 17:44:49 +08:00
Harry Bomrah e824e23e0a Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-09 17:32:06 +08:00