Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/orders
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
..
_articles.html.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
_form.html.haml Fixes orders. 2012-10-30 00:20:47 +01:00
_orders.html.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
edit.html.haml Fixed orders form. 2011-06-10 13:53:51 +02:00
index.html.haml Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
index.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
new.html.haml Fixes orders. 2012-10-30 00:20:47 +01:00
show.html.haml Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
show.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00