Christophe Vilayphiou 20504b2205 Merge branch 'design_team' into ldap ...

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

2012-04-30 07:57:20 +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-30 07:57:20 +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