Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/config
History
benni 620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
..
environments Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
initializers Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
locales Merge branch 'master' into master-rails3-merging 2012-12-11 10:32:59 +01:00
app_config.yml.SAMPLE Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00
application.rb Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
boot.rb First step for upgrading to rails 3. 2011-05-11 01:32:21 +02:00
database.yml.SAMPLE Updated README_DEVEL. 2011-05-06 20:38:39 +02:00
environment.rb First step for upgrading to rails 3. 2011-05-11 01:32:21 +02:00
navigation.rb Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
preinitializer.rb Implemented bundler. No more confusiong with gem versions! 2011-01-30 22:59:32 +01:00
routes.rb Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00