foodsoft/app/controllers
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
..
admin admin controllers 2013-02-09 12:47:21 +07:00
finance finish finance controller i18n 2013-02-22 00:44:39 +01:00
foodcoop workgroups i18n 2013-02-13 01:34:58 +01:00
application_controller.rb Fixed return_to when authorization gets lost. 2012-12-30 16:34:01 +01:00
article_categories_controller.rb Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
articles_controller.rb Prevent stock_articles from appearing in supplier article index 2013-01-30 21:21:49 +01:00
deliveries_controller.rb Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +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 finish login i18n + controller 2013-02-05 12:54:55 +01:00
memberships_controller.rb Bugfixing in memberships-filter. 2009-02-02 17:28:59 +01:00
messages_controller.rb finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
order_comments_controller.rb Refactoring of order comments. 2011-06-19 20:47:27 +02:00
orders_controller.rb finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
pages_controller.rb Fixed wiki pages. 2012-10-09 02:31:10 +02:00
sessions_controller.rb typo 2013-02-05 12:30:44 +01:00
stock_takings_controller.rb finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
stockit_controller.rb Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-06 01:01:12 +01:00
suppliers_controller.rb finish suppliers controller I18n 2013-02-08 00:31:09 +01:00
tasks_controller.rb Fixed some bugs in tasks, apple feature: 2012-12-16 19:07:45 +01:00
users_controller.rb Some fixes for task module. 2011-05-15 22:06:54 +02:00