Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap ... Conflicts: config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-05-08 11:40:38 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-08 11:40:38 +08:00
helpers	Fix bug that was never displaying preview	2012-05-07 17:29:56 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	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
views	Merge branch 'design_team' into ldap	2012-05-08 11:40:38 +08:00