foodsoft/app/views/shared
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
..
_alert_success.haml Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
_article_price_info.html.haml Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +02:00
_articles_by_articles.html.haml sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
_articles_by_groups.html.haml sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
_base_errors.haml Improve delivery validation: StockArticles must not be associated more than once 2013-06-26 17:58:55 +02:00
_comments.haml start of making nickname optional 2013-09-20 22:40:13 +02:00
_group.html.haml start of making nickname optional 2013-09-20 22:40:13 +02:00
_group_form_fields.html.haml beautify map invocations of users 2013-10-29 18:46:55 +01:00
_open_orders.html.haml Merge branch 'master' into allow-no-nickname 2013-10-29 19:15:52 +01:00
_user_form_fields.html.haml fix new user form 2013-10-29 19:11:33 +01:00
_workgroup_members.haml more user display changes 2013-09-22 02:15:35 +02:00