Commit Graph

716 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 da44ffc501 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-17 14:55:02 +08:00
Harry Bomrah f9dd55eea2 fixed chinese detection for url. 2015-07-17 14:53:50 +08:00
Harry Bomrah ee4f7e06e8 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-16 19:43:23 +08:00
Harry Bomrah afe1ffd437 page id validations for link and normal page fixed. 2015-07-16 19:42:05 +08:00
Harry Bomrah d2f21f5221 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-15 14:04:00 +08:00
Harry Bomrah 898059c6d2 small fixes for various stuff 2015-07-15 14:00:48 +08:00
Harry Bomrah cc303fb93d Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-09 14:22:12 +08:00
Harry Bomrah 8b8dd22e88 small bug fix for feeds if feed module is not present. 2015-07-09 14:20:49 +08:00
Harry Bomrah 53d5dd7d38 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-08 20:19:01 +08:00
Harry Bomrah bead39d5b4 small fix 2015-07-08 20:17:30 +08:00
Harry Bomrah d938e6b88d Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-08 20:05:33 +08:00
Harry Bomrah 93d66b5866 fix for meember role disabled fields and also role will delete all the attribute fields 2015-07-08 20:00:59 +08:00
Harry Bomrah 59a198005d added some stuff for feeds and utility 2015-07-07 19:55:46 +08:00
Harry Bomrah 41a1f83b08 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity 2015-07-06 18:37:25 +08:00
Harry Bomrah f7c377d092 allow ip in url for links 2015-07-06 18:36:14 +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 1951c581a2 added meta tag mechanism for facebook 2015-07-03 19:52:05 +08:00
Harry Bomrah b2056a2ad5 some test mods for feeds 2015-07-01 15:13:28 +08:00
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