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

595 Commits

Author SHA1 Message Date
Harry Bomrah 84fd35c17c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-27 21:41:00 +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 89c59f9673 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-23 17:20:34 +08:00
Harry Bomrah 0122f5aa23 small fix for member fields display 2015-04-23 17:20:08 +08:00
Harry Bomrah e5810c9aa0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-22 23:06:52 +08:00
Harry Bomrah b27467c65d sorting for role status fixed 2015-04-22 23:06:05 +08:00
Harry Bomrah 2cc97bc407 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-22 22:59:09 +08:00
Harry Bomrah 16389cb942 adding routes file 2015-04-22 22:58:51 +08:00
Harry Bomrah 094f8d93f4 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-22 22:53:24 +08:00
Harry Bomrah 97912d2d3a now can add or delete fields for the member 2015-04-22 22:53:04 +08:00
Harry Bomrah 345fd0ed37 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-22 18:30:57 +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 20180a1662 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-22 16:32:46 +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 2ceb55201b Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-21 17:44:09 +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 0239342f9c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-17 15:56:44 +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 61f45b5497 rails menu cache removed 2015-04-14 16:59:52 +08:00
Harry Bomrah 72c120c0ae rails menu cache removed 2015-04-14 16:58:45 +08:00
Harry Bomrah d58b993cb5 fix error for page submit 2015-04-10 18:41:36 +08:00
Harry Bomrah 4ecfb9bf80 fix error for page submit 2015-04-10 18:41:22 +08:00
Harry Bomrah 6c16e2aac8 fix for cache clear on page part submit 2015-04-10 16:35:55 +08:00
Harry Bomrah b2a5e361e8 fix for cache clear on page part submit 2015-04-10 16:35:18 +08:00
Harry Bomrah 95a3e61080 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-30 19:19:30 +08:00
Harry Bomrah be61b4488e temp ignore cache 2015-03-30 18:12:23 +08:00
Harry Bomrah ffc2d23cb9 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-30 16:49:01 +08:00
Harry Bomrah 73147223f8 added downloaded_extension file 2015-03-30 16:48:02 +08:00
Harry Bomrah d45f4eaf36 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-30 15:37:16 +08:00
Harry Bomrah 35eaf325f2 downloaded extension lock removed 2015-03-30 15:35:38 +08:00
Harry Bomrah aad4436344 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-30 15:19:51 +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
rulingcom f9ed19def0 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-23 13:25:13 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +08:00
Harry Bomrah 084ce700ec Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-18 18:00:40 +08:00
Harry Bomrah 2432a587d5 css mods for archive 2015-03-18 17:59:36 +08:00
Harry Bomrah ab4eefce87 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-18 15:42:39 +08:00
Harry Bomrah fb8c8d4526 fixed omniauth 2015-03-18 15:41:24 +08:00
rulingcom 20350c4e14 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-13 17:13:35 +08:00
Harry Bomrah 0d8d6b24c3 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-13 17:07:19 +08:00