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	Change orbit-bar for language but bug when user name is too long	2012-02-29 04:21:56 +08:00
controllers	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
helpers	Change orbit-bar for language but bug when user name is too long	2012-02-29 04:21:56 +08:00
models	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00