Commit graph

6 commits

Author SHA1 Message Date
wvengen
bdb9499535 fix broken update password flow 2014-01-08 14:09:28 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
wvengen
de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen
b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
benni
1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
Renamed from app/views/login/password.html.haml (Browse further)