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
..
.gitkeep	Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)	2011-04-13 18:19:51 +08:00
app_auth.rake	merge with november_presentation	2011-12-22 15:43:38 +08:00
dev.rake	Modifications for design, pages, page_parts…	2012-02-17 02:09:32 +08:00
mid_site_sync.rake	Complete for 229 check.	2012-02-24 19:07:47 +08:00
page_content.rake	Fix bugs and changes for nccu	2012-02-27 18:50:56 +08:00
pages.rake	Ray's modification before redesign	2012-01-24 11:57:27 +08:00
site.rake	Final modifications for the presentation	2011-11-22 18:54:10 +08:00
user.rake	Add methods to work with manager role,add task to build user test data	2012-01-24 12:28:32 +08:00