Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/controllers/admin
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
..
base_controller.rb Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
ordergroups_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
users_controller.rb Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
workgroups_controller.rb admin controllers 2013-02-09 12:47:21 +07:00