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

614 Commits

Author SHA1 Message Date
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 0d7bae7acc Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-28 16:08:33 +08:00
Harry Bomrah 2f58c02ee5 cant select empty value in page parts 2015-04-28 16:07:43 +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 a833bfd606 page id cannot be chinese and also some module update fixes 2015-04-27 20:46:01 +08:00
Harry Bomrah 7210f46f35 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-23 17:21:10 +08:00
Harry Bomrah 0122f5aa23 small fix for member fields display 2015-04-23 17:20:08 +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 143d8009c5 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 22:59:42 +08:00
Harry Bomrah 16389cb942 adding routes file 2015-04-22 22:58:51 +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 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 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 babf12c777 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-21 17:44:39 +08:00
Harry Bomrah 0746250c46 removed update all button 2015-04-21 17:43:44 +08:00
Harry Bomrah 07f6b6aab2 module update stuff added to kernel 2015-04-21 17:43:33 +08:00
Harry Bomrah ef8728c6fa modified debugging for frontend 2015-04-17 15:56:06 +08:00
Harry Bomrah 449d809b35 debug added for modules and widgets frontend 2015-04-17 15:55:58 +08:00
Harry Bomrah 6c1683f7d5 rails menu cache removed 2015-04-14 17:00:08 +08:00
Harry Bomrah 72c120c0ae rails menu cache removed 2015-04-14 16:58:45 +08:00
Harry Bomrah 4ecfb9bf80 fix error for page submit 2015-04-10 18:41:22 +08:00
Harry Bomrah b2a5e361e8 fix for cache clear on page part submit 2015-04-10 16:35:18 +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 363610c5c9 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-30 16:49:23 +08:00
Harry Bomrah 73147223f8 added downloaded_extension file 2015-03-30 16:48:02 +08:00
Harry Bomrah 07e96225a7 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-30 15:39:13 +08:00
Harry Bomrah 35eaf325f2 downloaded extension lock removed 2015-03-30 15:35:38 +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 90eba5141e removed lock file 2015-03-30 15:19:01 +08:00
Harry Bomrah 6d06790159 added expire time to cache. 2015-03-30 15:13:45 +08:00
Harry Bomrah 27222ab6cd small fix for cache 2015-03-30 15:13:37 +08:00
Harry Bomrah 8b2281ca17 now the caching initialized with engine 
Conflicts:
	Gemfile
 2015-03-30 15:12:41 +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 4b770b7fd1 group create fix 2015-03-25 15:50:58 +08:00
Harry Bomrah b290d3653f groups commit 2015-03-25 15:46:11 +08:00
rulingcom e1c8d61195 sdk precompile fixed 2015-03-23 17:39:58 +08:00
nccu 4603c8b53f help desinger fix IE8 2015-03-23 17:17:52 +08:00
nccu b0d454f274 help designer IE8 fix 2015-03-23 16:28:42 +08:00
nccu fcbb04ccc5 help designer IE8 fix 2015-03-23 16:12:26 +08:00
rulingcom f9ed19def0 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-23 13:25:13 +08:00
nccu 013ba56111 precompile fix and also impressionist fix 2015-03-19 18:42:29 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +08:00
Harry Bomrah 25bf24745c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 18:01:00 +08:00