Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views
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
..
admin Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
article_categories Small fixes for article_categories. 2012-11-10 16:51:30 +01:00
articles Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
deliveries Fixed deliveries. 2012-10-17 20:45:52 +02:00
feedback Fixed feedback. 2012-11-10 17:05:43 +01:00
finance Merge branch 'master' into master-rails3-merging 2012-12-11 10:32:59 +01:00
foodcoop Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
group_orders Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
home Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
invites Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
kaminari Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
layouts Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
login Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
mailer Fixed feedback. 2012-11-10 17:05:43 +01:00
messages Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
order_comments Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
ordergroups Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
orders Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
pages Nice breadcrumb 2012-10-18 23:43:31 +02:00
sessions Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
shared Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
stock_takings Fixed stockit. 2012-10-29 18:28:17 +01:00
stockit Fixed stockit. 2012-10-29 18:28:17 +01:00
suppliers Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
tasks Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
workgroups Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00