Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1708 commits 22 branches 1 tag 31 MiB
Commit graph

5 commits

Author SHA1 Message Date
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
Benjamin Meichsner
762d529894 Added info link for apple restriction feature. 2013-03-09 18:14:53 +01:00
wvengen
2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
benni
f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni
ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00