Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/controllers
History
wvengen f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
..
admin Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
finance Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
foodcoop Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
application_controller.rb Fixed return_to when authorization gets lost. 2012-12-30 16:34:01 +01:00
article_categories_controller.rb small i18n/translation fixes 2013-04-10 14:07:59 +02:00
articles_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
deliveries_controller.rb finish deliveries i18n 2013-04-10 17:02:16 +02:00
feedback_controller.rb i18n feedback + controller 2013-02-09 13:01:44 +07:00
group_orders_controller.rb finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00
home_controller.rb also internationalize home controller 2013-02-04 02:12:24 +01:00
invites_controller.rb invites controller i18n 2013-02-04 13:01:06 +01:00
login_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +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 typo 2013-02-05 12:30:44 +01:00
stock_takings_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
stockit_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
suppliers_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
tasks_controller.rb fix tasks error reference 2013-04-12 01:08:35 +02:00
users_controller.rb Some fixes for task module. 2011-05-15 22:06:54 +02:00