Commit Graph

186 Commits

Author SHA1 Message Date
Harry Bomrah a0ee8bc3b8 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-20 17:30:46 +08:00
Harry Bomrah 9ec5e21500 fix for fallback if site cant communicate to store and also fixed edit mode 2015-07-20 17:29:29 +08:00
Harry Bomrah e0d55ba507 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-03 20:40:17 +08:00
Harry Bomrah b2056a2ad5 some test mods for feeds 2015-07-01 15:13:28 +08:00
Harry Bomrah 2f04300030 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-25 13:40:34 +08:00
Harry Bomrah 4068d8488a language switch for orbit bar can be enabled or disabled from backend. 2015-06-24 18:00:09 +08:00
Harry Bomrah 480bbeeda0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-05 18:57:15 +08:00
Harry Bomrah cfda81a546 added site bar settings for logo and title in frontend, fixed role status disbale enable and also added br to text area 2015-06-05 18:55:28 +08:00
Harry Bomrah 427cb03ecf Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-02 19:56:54 +08:00
Harry Bomrah b729e32258 now default modules will be automatically authorized after registering of website. 2015-06-02 19:54:23 +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 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 d26a5bedb7 added members page to groups 2015-05-26 15:00:24 +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 8dac8273f7 group mods.. 2015-05-20 14:17:00 +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 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 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 2ceb55201b Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-04-21 17:44:09 +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 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 15fec35e3f groups multifile added and show page working. 2015-04-01 01:02:01 +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 aad4436344 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-30 15:19:51 +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
rulingcom e1c8d61195 sdk precompile fixed 2015-03-23 17:39:58 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +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
Harry Bomrah 0d8d6b24c3 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-13 17:07:19 +08:00
Harry Bomrah f71b5d6bbb groups started 2015-03-12 19:02:48 +08:00
Harry Bomrah 3aa4922632 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-06 17:48:09 +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
Harry Bomrah 686b402915 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-03-04 19:58:38 +08:00