foodsoft/app
wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02:00
..
assets Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
controllers Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
documents Fixed bug in fax template when there are missing supplier infos. 2013-03-17 18:10:48 +01:00
helpers Only show undeleted articles in delivery/stock_taking forms. 2013-03-23 18:25:54 +01:00
inputs Improved tasks. 2012-10-08 21:52:03 +02:00
mailers Set host infos for urls in emails via app_config. 2012-12-28 13:55:18 +01:00
models Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
views Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
workers Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00