Commit Graph

320 Commits

Author SHA1 Message Date
Harry Bomrah 78399d4f91 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-07-03 20:42:05 +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 251133748d fixed zh-cn conversion and also back page from page not available page. 2015-06-25 17:38:23 +08:00
Harry Bomrah e168b01f9b added page not available in language page. 2015-06-25 13:31:05 +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 e594d345cc added sync and sorting for members 2015-06-05 14:21:34 +08:00
Harry Bomrah 76c2048a29 small fix 2015-06-02 20:13:30 +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 5977370c98 groups member now available 2015-06-01 16:17:45 +08:00
Harry Bomrah e8b727af01 group mods for edit post 2015-05-28 14:19:55 +08:00
Harry Bomrah d26a5bedb7 added members page to groups 2015-05-26 15:00:24 +08:00
Harry Bomrah c406951876 delete post, edit groups done 2015-05-23 03:48:07 +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
Harry Bomrah 694f839217 added edit mode button in frontend 2015-05-12 17:30:45 +08:00
Harry Bomrah a160c6b020 child page relocation fixed 2015-05-12 15:51:33 +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 6ff99124fd member profile creation fixed 2015-05-11 19:30:03 +08:00
Harry Bomrah a4081d40b2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-05-05 18:13:41 +08:00
Ruling-iMac d386174c97 add function : redirect to homepage 2015-04-30 18:31:40 +08:00
Harry Bomrah 95704ed56e Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-30 14:40:03 +08:00
Harry Bomrah 83656d2362 small fix for member show page 2015-04-29 17:34:57 +08:00
Harry Bomrah ae785defc2 groups version 2.0 2015-04-28 22:24:25 +08:00
Harry Bomrah f16b1b34b5 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-28 17:57:22 +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 ccb9a24861 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-27 21:41:27 +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 45f58990f0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 23:07:18 +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 4b6c27de75 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 22:53:52 +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 c902c51006 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 18:31:21 +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 760404cbd2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 16:33:09 +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 babf12c777 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-21 17:44:39 +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 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 0b787a1067 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-30 18:14:12 +08:00