Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb		2012-04-25 16:45:04 +08:00
..
confirmations	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
mailer	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
menu	Ika's changes	2011-08-25 08:07:18 +08:00
passwords	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
registrations	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
sessions	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00
shared	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
unlocks	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00