Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/controllers
History
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 		2013-11-18 11:42:49 +01:00
..
admin make search work without nickname usage 2013-09-20 23:18:06 +02:00
finance fix i18n 2013-10-02 17:23:49 +02:00
foodcoop make search work without nickname usage 2013-09-20 23:18:06 +02:00
application_controller.rb add missing i18n 2013-10-02 17:13:49 +02:00
article_categories_controller.rb small i18n/translation fixes 2013-04-10 14:07:59 +02:00
articles_controller.rb fix category heading 2013-10-10 19:22:43 +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 doc update [ci skip] 2013-11-07 20:46:05 +01: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 add missing i18n 2013-10-04 10:25:53 +02: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 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01: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 StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +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 beautify map invocations of users 2013-10-29 18:46:55 +01:00