Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/orders
History
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
..
_articles.html.haml finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
_form.html.haml finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01: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 fix orders i18n 2013-02-11 15:34:31 +01:00
show.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00