Commit Graph

696 Commits

Author SHA1 Message Date
Harry Bomrah a4e7a396dc Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-25 17:41:22 +08:00
Harry Bomrah 251133748d fixed zh-cn conversion and also back page from page not available page. 2015-06-25 17:38:23 +08:00
Harry Bomrah 804fdd044d Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-25 17:05:49 +08:00
Harry Bomrah 5acfed083a validation for links 2015-06-25 17:02:50 +08:00
Harry Bomrah f181332d86 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-25 15:30:10 +08:00
Harry Bomrah afde19052e added default hash for links 2015-06-25 15:27:29 +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 e168b01f9b added page not available in language page. 2015-06-25 13:31:05 +08:00
rulingcom dd3b4f0384 sdk update for groups and orbit_bootstrap by joshua 2015-06-24 18:09:59 +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 cb1a40d8b3 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-24 16:56:23 +08:00
Harry Bomrah 94f1de8de9 changed fields for member roles 2015-06-24 16:54:44 +08:00
Harry Bomrah 262ee137a7 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-24 01:40:07 +08:00
Harry Bomrah 3dc625e34f modified dob for member profile 2015-06-24 01:38:12 +08:00
Harry Bomrah a577307a5c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-05 19:07:45 +08:00
rulingcom ed24126648 joshuas update for sdk and grou 2015-06-05 19:05:01 +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 1ee6b4cc67 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-06-05 14:25:32 +08:00
Harry Bomrah e594d345cc added sync and sorting for members 2015-06-05 14:21:34 +08:00
rulingcom 25eb95672a joshua mods for calendar accessbility 2015-06-03 18:17:58 +08:00
Harry Bomrah 76c2048a29 small fix 2015-06-02 20:13:30 +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 2508d70883 calendar widget and frontend fix 2015-06-02 17:22:05 +08:00
Harry Bomrah 5977370c98 groups member now available 2015-06-01 16:17:45 +08:00
rulingcom a3033c548b mods by joshua for groups and calendar and etc sdk 2015-06-01 16:15:07 +08:00
rulingcom 822a6932cd joshuas update for groups 2015-05-28 21:19:58 +08:00
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