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
..
_archive_tasks.html.haml	fix and cleanup routing (closes foodcoops#190)	2013-10-30 02:27:04 +01:00
_form.html.haml	beautify map invocations of users	2013-10-29 18:46:55 +01:00
_list.haml	Add repeated symbol to task list.	2013-06-27 10:22:22 +02:00
_nav.haml	fix i18n buglets (closes #167)	2013-09-10 10:27:13 +02:00
archive.haml	finish tasks i18n	2013-04-12 00:00:02 +02:00
archive.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
edit.haml	finish tasks i18n	2013-04-12 00:00:02 +02:00
index.haml	finish tasks i18n	2013-04-12 00:00:02 +02:00
new.haml	finish tasks i18n	2013-04-12 00:00:02 +02:00
show.haml	i18n simple_form move of tasks	2013-10-09 22:41:23 +02:00
user.html.haml	fix i18n buglets (closes #167)	2013-09-10 10:27:13 +02:00
workgroup.haml	Removed obsolete code of old workgroup-centric weekly task concept.	2013-06-22 18:14:11 +02:00