Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/orders
History
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
..
_articles.html.haml show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
_form.html.haml Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
_orders.html.haml finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
edit.html.haml finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
index.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
index.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
new.html.haml finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
show.html.haml Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
show.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00