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

..

admin

Add categories for all the widgets

2012-02-28 22:00:05 +08:00

devise

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

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

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Announcement modifications and tags

2012-02-15 00:34:22 +08:00

layouts

change Search bar

2012-02-29 11:29:13 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00