foodsoft/app/views
Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
Conflicts:
	app/helpers/application_helper.rb
2013-01-27 22:01:53 +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 Temporairly deactivated helper in new delivery form. 2013-01-26 15:57:29 +01: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 Fixed wrong start balance in new group order. 2013-01-26 15:17:56 +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 Fixed missing line breaks in haml email templates. 2012-12-30 16:24:36 +01:00
login Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
mailer Fixed missing line breaks in haml email templates. 2012-12-30 16:24:36 +01:00
messages Fixed bug in accessing foodsoft config. 2012-12-28 13:28:03 +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 Fixed some bugs in tasks, apple feature: 2012-12-16 19:07:45 +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 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 2013-01-27 22:01:53 +01:00
stockit_selections Add stock_article_selection (deleting multiple stock articles at once) 2013-01-12 16:14:06 +01:00
suppliers Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
tasks Show accept/reject button in task show view. 2012-12-22 14:29:59 +01:00
workgroups Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00