Commit Graph

668 Commits

Author SHA1 Message Date
Harry Bomrah 3d04118037 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-28 20:13:19 +08:00
Harry Bomrah 9ca761b952 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-28 20:10:57 +08:00
Harry Bomrah 1f25dbdfec version added for mongoid 2015-05-28 20:10:26 +08:00
rulingcom 98ec676197 joshua commit for groups and orbit bar again 2015-05-28 14:27:27 +08:00
Harry Bomrah e8b727af01 group mods for edit post 2015-05-28 14:19:55 +08:00
Harry Bomrah 7638a95385 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-26 16:03:33 +08:00
Harry Bomrah 2fc15eab29 xss issue fixed 2015-05-26 16:02:16 +08:00
Harry Bomrah d26a5bedb7 added members page to groups 2015-05-26 15:00:24 +08:00
rulingcom 8099a79918 joshua update for groups and orbit bar 2015-05-26 14:13:38 +08:00
Harry Bomrah 6a49fb58e7 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-23 03:50:10 +08:00
Harry Bomrah c406951876 delete post, edit groups done 2015-05-23 03:48:07 +08:00
Harry Bomrah ee121fa0aa Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-20 21:18:46 +08:00
Harry Bomrah a440076916 fix orbit bar css for the software 2015-05-20 21:13:39 +08:00
Harry Bomrah 8dac8273f7 group mods.. 2015-05-20 14:17:00 +08:00
rulingcom 017be3eb3d joshua commit for groups, sdk and orbit_bar 2015-05-18 16:26:22 +08:00
Harry Bomrah 2af2a208ab Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-15 21:34:33 +08:00
Harry Bomrah 3772e350ba now can insert word to ckeditor directly and also fixed looping problem for freego software. 2015-05-15 21:33:11 +08:00
Harry Bomrah 95e7403aaa Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-13 15:41:17 +08:00
Harry Bomrah 451176b068 text with number of counts 2015-05-13 15:36:42 +08:00
Harry Bomrah c5b39c7e45 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-12 17:31:54 +08:00
Harry Bomrah 694f839217 added edit mode button in frontend 2015-05-12 17:30:45 +08:00
Harry Bomrah aed6f7f34a Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-12 15:52:45 +08:00
Harry Bomrah a160c6b020 child page relocation fixed 2015-05-12 15:51:33 +08:00
Harry Bomrah ba44a224d3 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-12 14:10:48 +08:00
Harry Bomrah bd7e29773f fix small bug for creating member
Please enter the commit message for your changes. Lines starting
2015-05-12 14:08:21 +08:00
Harry Bomrah 9cf3fab749 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-11 19:33:11 +08:00
Harry Bomrah 6ff99124fd member profile creation fixed 2015-05-11 19:30:03 +08:00
Harry Bomrah dc9bebd479 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-05 20:05:31 +08:00
Harry Bomrah 7180b94bd6 fix language sitemap name 2015-05-05 20:03:09 +08:00
Harry Bomrah 602ef183c0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-05-05 18:13:13 +08:00
Harry Bomrah 7654fc7f23 language in orbit bar fixed 2015-05-05 18:08:57 +08:00
Harry Bomrah 52037fba2c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-30 21:10:08 +08:00
Harry Bomrah 4638b4bca9 downloaded extensions added 2015-04-30 21:08:52 +08:00
Harry Bomrah a281c8c748 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-30 20:36:05 +08:00
Harry Bomrah f17f847dbd url validation added. 2015-04-30 20:32:53 +08:00
Harry Bomrah 42e4e377c4 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-30 18:54:23 +08:00
Ruling-iMac d386174c97 add function : redirect to homepage 2015-04-30 18:31:40 +08:00
Harry Bomrah c7f6c97789 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-30 14:39:43 +08:00
Harry Bomrah 927b08edeb fix main forms css and a user profile bug 2015-04-30 14:38:36 +08:00
Harry Bomrah 245f355b75 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-29 17:36:04 +08:00
Harry Bomrah 83656d2362 small fix for member show page 2015-04-29 17:34:57 +08:00
Harry Bomrah 3f48b5886f updated name 2015-04-28 22:49:15 +08:00
Harry Bomrah 5935a91795 changed member to community 2015-04-28 22:47:56 +08:00
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