Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app
History
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 		2012-12-14 18:10:46 +01:00
..
assets Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
controllers Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
documents Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
helpers Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
inputs Improved tasks. 2012-10-08 21:52:03 +02:00
mailers Fixed feedback. 2012-11-10 17:05:43 +01:00
models Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
views Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00