Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/articles
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
..
_article.html.haml Fixed articles module. 2012-10-28 18:03:50 +01:00
_articles.html.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
_destroy_active_article.haml Implemented fancy box for ajax forms. Refactored articles modul. 2011-05-18 17:37:10 +02:00
_edit_all_table.html.haml Fixed articles module. 2012-10-28 18:03:50 +01:00
_form.html.haml Fixed articles views. 2012-10-19 01:12:47 +02:00
_import_search_results.haml Fixed articles views. 2012-10-19 01:12:47 +02:00
create.js.haml Fixed articles views. 2012-10-19 01:12:47 +02:00
destroy.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
edit_all.html.haml Fixed articles module. 2012-10-28 18:03:50 +01:00
index.haml Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
index.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
new.js.haml Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
parse_upload.html.haml Fixed articles module. 2012-10-28 18:03:50 +01:00
shared.js.haml Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
sync.html.haml Complete refactoring of orders-workflow. 2009-01-29 01:57:51 +01:00
update.js.haml Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
upload.html.haml Fixed articles module. 2012-10-28 18:03:50 +01:00