Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709 ... Merge branch 'nccu0621' Conflicts: Gemfile config/resque.god vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb		2012-07-09 16:02:59 +08:00
..
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
announcement_tag.rb	Add sorting order for NCCU request	2012-07-03 15:47:28 +08:00
bulletin.rb	NCCU 上傳版本 0709	2012-07-09 16:02:59 +08:00
bulletin_category.rb	orbit disable object for categories	2012-07-05 16:00:45 +08:00
bulletin_file.rb	Changes for dat and time format	2012-05-18 19:42:36 +08:00
bulletin_link.rb	fix dashboard & announcement	2012-03-16 14:44:57 +08:00
bulletin_tag.rb	DRY code for sorting	2012-04-30 06:30:52 +08:00
unit_list_for_anc.rb	add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.	2012-05-04 15:50:45 +08:00