foodsoft/app/controllers
Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master
Conflicts:
	app/views/suppliers/shared_suppliers.haml
2013-09-02 13:31:40 +02:00
..
admin fix i18n bug 2013-06-06 02:13:40 +02:00
finance fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) 2013-06-24 13:32:07 +02:00
foodcoop Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
application_controller.rb Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +02:00
article_categories_controller.rb small i18n/translation fixes 2013-04-10 14:07:59 +02:00
articles_controller.rb Merge branch 'rails3' into rails3-to-master 2013-09-02 13:31:40 +02:00
deliveries_controller.rb Separate actions for new StockArticle 2013-07-07 14:14:32 +02:00
feedback_controller.rb i18n feedback + controller 2013-02-09 13:01:44 +07:00
group_orders_controller.rb fix i18n key 2013-06-30 13:08:13 +02:00
home_controller.rb finishes i18n set_locale with user settings 2013-06-14 02:39:25 +02:00
invites_controller.rb invites controller i18n 2013-02-04 13:01:06 +01:00
login_controller.rb finishes i18n set_locale with user settings 2013-06-14 02:39:25 +02:00
memberships_controller.rb Bugfixing in memberships-filter. 2009-02-02 17:28:59 +01:00
messages_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
order_comments_controller.rb Refactoring of order comments. 2011-06-19 20:47:27 +02:00
orders_controller.rb update en translation 2013-04-12 01:30:02 +02:00
pages_controller.rb finish pages i18n 2013-04-12 00:59:45 +02:00
sessions_controller.rb german i18n + mini fix 2013-07-18 16:23:29 +02:00
stock_takings_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
stockit_controller.rb Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
suppliers_controller.rb Merge branch 'rails3' into rails3-to-master 2013-09-02 13:31:40 +02:00
tasks_controller.rb Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
users_controller.rb Some fixes for task module. 2011-05-15 22:06:54 +02:00