Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap ...

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

2012-05-22 20:33:07 +08:00

..

.gitkeep

merge with master

2012-01-11 20:31:52 +08:00

announcement_tag.rb

Fix bug widget when no bulletins or web_links, put link in bulletins

2012-02-23 15:50:30 +08:00

bulletin_category.rb

Changes on nccu

2012-05-18 15:20: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

bulletin.rb

Changes for dat and time format

2012-05-18 19:42:36 +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