foodsoft/app/views
wvengen b30b424540 Merge branch 'master' into feature-receive
Conflicts:
	app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
..
admin fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
article_categories small i18n bug 2013-10-22 00:09:11 +02:00
articles introduce new layout in balancing article screen as well 2013-12-23 16:11:14 +01:00
deliveries fix articles_for_select2 helper 2013-12-18 17:34:45 +01:00
feedback i18n feedback + controller 2013-02-09 13:01:44 +07:00
finance ui update for packages display 2014-01-03 12:42:36 +01:00
foodcoop proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
group_orders hide row when information not present 2013-11-24 02:16:15 +01:00
home Allow control of password autocomplete by flag 2013-12-22 23:21:14 +01:00
invites small i18n update 2013-10-02 17:08:24 +02:00
kaminari Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
layouts adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
login fix broken update password flow 2014-01-08 14:09:28 +01:00
mailer start of making nickname optional 2013-09-20 22:40:13 +02:00
messages Do not escape mailing list wiki link in the message form (foodcoops#227) 2013-12-22 01:59:33 +01:00
order_articles Merge branch 'master' into feature-receive 2014-01-09 18:42:29 +01:00
order_comments Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
ordergroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
orders put footer below body, now that is allowed in html5 2014-01-09 14:47:05 +01:00
sessions clearer login field name 2013-10-30 21:28:35 +01:00
shared Merge pull request #234 from foodcoop-adam/article-dialog 2014-01-03 05:16:03 -08:00
stock_takings fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +01:00
stockit Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
suppliers Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
tasks fix workgroup link task list 2013-12-10 19:12:29 +01:00
workgroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00