alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
686 Commits 12 Branches 0 Tags 17 MiB
Commit Graph

183 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 94f1de8de9 changed fields for member roles 2015-06-24 16:54:44 +08:00
Harry Bomrah 3dc625e34f modified dob for member profile 2015-06-24 01:38:12 +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 a440076916 fix orbit bar css for the software 2015-05-20 21:13:39 +08:00
Harry Bomrah 451176b068 text with number of counts 2015-05-13 15:36:42 +08:00
Harry Bomrah 7180b94bd6 fix language sitemap name 2015-05-05 20:03:09 +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
Harry Bomrah 4638b4bca9 downloaded extensions added 2015-04-30 21:08:52 +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 ccb9a24861 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-27 21:41:27 +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 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 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 ef8728c6fa modified debugging for frontend 2015-04-17 15:56:06 +08:00
Harry Bomrah 449d809b35 debug added for modules and widgets frontend 2015-04-17 15:55:58 +08:00
Harry Bomrah 25c612ac9e modified debugging for frontend 2015-04-17 15:54:32 +08:00
Harry Bomrah 54eb8ee766 debug added for modules and widgets frontend 2015-04-15 13:39:46 +08:00
Harry Bomrah 6c1683f7d5 rails menu cache removed 2015-04-14 17:00:08 +08:00
Harry Bomrah 72c120c0ae rails menu cache removed 2015-04-14 16:58:45 +08:00
Harry Bomrah a481be0694 rails menu cache removed 2015-04-14 16:57:44 +08:00
Harry Bomrah 1cfd6b80f9 lot of changes for groups 2015-04-14 15:18:58 +08:00
Harry Bomrah 3362601b1f Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	lib/orbit_model/impression.rb
 2015-03-30 15:22:03 +08:00
manson 3262359911 update impression and add cache for page sub-parts, main-menu 2015-03-30 15:11:26 +08:00
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
Harry Bomrah 2d1f9cb1ab Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-02-26 14:56:06 +05:30
Harry Bomrah 5773d49218 small fix for datepicker 2015-02-26 14:53:55 +05:30
Harry Bomrah 3e1032f801 fixed date and time for announcement and news 2015-02-26 14:53:55 +05:30
Ray f3e9679e54 增加右上角的新增按鈕 
使用方式是當 render filter 在最後放個 true
範例：<%=  render_filter @filter_fields, "index_table", true %>
 2015-02-26 15:01:06 +08:00
Harry Bomrah ceb110e030 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-07 16:13:19 +08:00
Harry Bomrah 6e27bbd483 module store changes 2014-12-30 18:38:11 +08:00
Harry Bomrah c8d395aca1 fixed tags and also some store commits 2014-12-28 14:43:34 +08:00
Harry Bomrah 4575fce2a9 counter added and also some changes for store 2014-12-26 16:55:28 +08:00
Harry Bomrah f19ce9b961 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 
Conflicts:
	Gemfile
	app/controllers/pages_controller.rb
	app/views/orbit_bar/index.html.erb
 2014-12-19 16:41:15 +08:00
Harry Bomrah 1da348f747 some mods for calendar 2014-12-16 19:34:29 +08:00
Harry Bomrah 54fd95163b lot of fixes and experience enhancement 2014-12-10 18:14:45 +08:00
Harry Bomrah 84308c3d10 category enhancements 2014-12-10 18:13:51 +08:00
Harry Bomrah 4b86270725 some category disable improvements 2014-12-10 18:13:51 +08:00
Harry Bomrah 4415093ce2 lot of fixes and experience enhancement 2014-12-10 18:09:50 +08:00
Harry Bomrah 05852ed09f category enhancements 2014-12-09 22:00:40 +08:00
Harry Bomrah e521e1ea26 some category disable improvements 2014-12-09 21:25:51 +08:00
Harry Bomrah b9a6e6fe05 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-08 15:54:03 +08:00
Harry Bomrah 8b2e88be0a added is user sub manager 2014-12-08 15:52:37 +08:00
Harry Bomrah 96cf61f688 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2014-12-04 15:56:15 +08:00