Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine ...

Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb

2012-02-29 13:07:21 +08:00

..

assets

Ika's changes

2012-02-23 15:53:15 +08:00

controllers

Add category for announcement widget

2012-02-28 14:08:57 +08:00

helpers

merge with master

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

mailers

merge with master

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

models

Finish sorting for announcements

2012-02-24 15:30:49 +08:00

views

Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

2012-02-29 13:07:21 +08:00