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

625 Commits

Author SHA1 Message Date
Harry Bomrah 1495466b68 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-28 22:35:52 +08:00
Harry Bomrah ae785defc2 groups version 2.0 2015-04-28 22:24:25 +08:00
rulingcom 804030751f big commit from joshua for orbit_bootstrap sdk and groups 2015-04-28 18:34:40 +08:00
Harry Bomrah 70bbe6ac5a fix for table layout for members 2015-04-28 18:23:59 +08:00
Harry Bomrah d3f1808147 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-28 17:56:58 +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 d517e3c639 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-28 16:08:04 +08:00
Harry Bomrah 2f58c02ee5 cant select empty value in page parts 2015-04-28 16:07:43 +08:00
Harry Bomrah a20d446283 cant select empty value in page parts 2015-04-28 15:48:15 +08:00
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 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 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 0380972e5b small fix for member fields display 2015-04-23 17:19:10 +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 c39ca8c360 sorting for role status fixed 2015-04-22 23:05:17 +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 37c28fd03e adding routes file 2015-04-22 22:58:10 +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 997a3afd93 now can add or delete fields for the member 2015-04-22 22:51:30 +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 cf7e15d4bb user friendly for editing members 2015-04-22 18:28:14 +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 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 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 573030b119 removed update all button 2015-04-21 17:40:48 +08:00
Harry Bomrah b1be711fd5 module update stuff added to kernel 2015-04-21 17:19:00 +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 25c612ac9e modified debugging for frontend 2015-04-17 15:54:32 +08:00
Harry Bomrah 54eb8ee766 debug added for modules and widgets frontend 2015-04-15 13:39:46 +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 a481be0694 rails menu cache removed 2015-04-14 16:57:44 +08:00
Harry Bomrah ec4f54fcc4 mongoid fix 2015-04-14 16:18:44 +08:00
rulingcom 5aac9b297d merged 2015-04-14 15:31:41 +08:00
Harry Bomrah 1cfd6b80f9 lot of changes for groups 2015-04-14 15:18:58 +08:00
Harry Bomrah d58b993cb5 fix error for page submit 2015-04-10 18:41:36 +08:00