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

301 Commits

Author SHA1 Message Date
Harry Bomrah a4081d40b2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-05-05 18:13:41 +08:00
Ruling-iMac d386174c97 add function : redirect to homepage 2015-04-30 18:31:40 +08:00
Harry Bomrah 95704ed56e Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-30 14:40:03 +08:00
Harry Bomrah 83656d2362 small fix for member show page 2015-04-29 17:34:57 +08:00
Harry Bomrah ae785defc2 groups version 2.0 2015-04-28 22:24:25 +08:00
Harry Bomrah f16b1b34b5 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-28 17:57:22 +08:00
Harry Bomrah 8c2f10e59c authorization fix for create and update of plugins 2015-04-28 17:56:01 +08:00
Harry Bomrah b5d2d7736c authorization fix for create and update of plugins 2015-04-28 17:54:49 +08:00
Harry Bomrah ccb9a24861 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-27 21:41:27 +08:00
Harry Bomrah f9dcf7db3a removed mobile settings and also removed bundle update from server 2015-04-27 21:40:38 +08:00
Harry Bomrah 083b6ace78 removed mobile settings and also removed bundle update from server 2015-04-27 21:39:46 +08:00
Harry Bomrah a833bfd606 page id cannot be chinese and also some module update fixes 2015-04-27 20:46:01 +08:00
Harry Bomrah 057f689526 page id cannot be chinese and also some module update fixes 2015-04-27 20:45:05 +08:00
Harry Bomrah 45f58990f0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 23:07:18 +08:00
Harry Bomrah b27467c65d sorting for role status fixed 2015-04-22 23:06:05 +08:00
Harry Bomrah c39ca8c360 sorting for role status fixed 2015-04-22 23:05:17 +08:00
Harry Bomrah 4b6c27de75 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 22:53:52 +08:00
Harry Bomrah 97912d2d3a now can add or delete fields for the member 2015-04-22 22:53:04 +08:00
Harry Bomrah 997a3afd93 now can add or delete fields for the member 2015-04-22 22:51:30 +08:00
Harry Bomrah c902c51006 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 18:31:21 +08:00
Harry Bomrah 1a19b97258 user friendly for editing members 
Conflicts:
	app/views/admin/members/edit.html.erb
 2015-04-22 18:30:37 +08:00
Harry Bomrah cf7e15d4bb user friendly for editing members 2015-04-22 18:28:14 +08:00
Harry Bomrah 760404cbd2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 16:33:09 +08:00
Harry Bomrah dd5f7ed234 fixed bug in members frontend and also roles and role statuses sorted on key ascending 2015-04-22 16:32:24 +08:00
Harry Bomrah db88b1e553 fixed bug in members frontend and also roles and role statuses sorted on key ascending 2015-04-22 16:30:58 +08:00
Harry Bomrah babf12c777 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-21 17:44:39 +08:00
Harry Bomrah 07f6b6aab2 module update stuff added to kernel 2015-04-21 17:43:33 +08:00
Harry Bomrah b1be711fd5 module update stuff added to kernel 2015-04-21 17:19:00 +08:00
Harry Bomrah 1cfd6b80f9 lot of changes for groups 2015-04-14 15:18:58 +08:00
Harry Bomrah 15fec35e3f groups multifile added and show page working. 2015-04-01 01:02:01 +08:00
Harry Bomrah 0b787a1067 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-30 18:14:12 +08:00
Harry Bomrah be61b4488e temp ignore cache 2015-03-30 18:12:23 +08:00
Harry Bomrah 3362601b1f Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	lib/orbit_model/impression.rb
 2015-03-30 15:22:03 +08:00
Harry Bomrah 6d06790159 added expire time to cache. 2015-03-30 15:13:45 +08:00
manson 3262359911 update impression and add cache for page sub-parts, main-menu 2015-03-30 15:11:26 +08:00
Harry Bomrah b290d3653f groups commit 2015-03-25 15:46:11 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +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 f71b5d6bbb groups started 2015-03-12 19:02:48 +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
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
Harry Bomrah 8e7319b3c3 fixed js 2015-03-04 20:31:33 +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
spen e616c4b947 fix member pic name 2015-01-20 15:27:43 +08:00
Harry Bomrah 5b570fe8a1 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-09 17:44:49 +08:00
spen 92575e01fa fix member plugins 2015-01-09 16:13:17 +08:00
Harry Bomrah ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
Harry Bomrah 12107376b6 fix for restarting server 2014-12-31 16:41:47 +08:00