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	finished admin/users i18n + dry the admin i18n	2013-02-04 01:38:18 +07:00
article_categories	Small fixes for article_categories.	2012-11-10 16:51:30 +01:00
articles	Merge branch 'master' into master-to-rails3	2012-12-14 18:10:46 +01:00
deliveries	Temporairly deactivated helper in new delivery form.	2013-01-26 15:57:29 +01:00
feedback	i18n feedback + controller	2013-02-09 13:01:44 +07:00
finance	finish finance invoice i18n and en translation	2013-02-27 12:31:01 +01:00
foodcoop	finish foodcoop i18n + controller + model	2013-02-22 00:19:22 +01:00
group_orders	clarify group_orders i18n	2013-02-12 00:06:23 +01:00
home	finished home i18n	2013-02-04 00:46:22 +01:00
invites	fix small format bug in template	2013-02-04 13:13:04 +01:00
kaminari	Replace will_paginate with kaminari. Fixed foodcoop/users page.	2012-10-08 15:24:32 +02:00
layouts	finish layouts i18n, use help url from config, use html language from locale	2013-02-05 12:11:29 +01:00
login	finish login i18n + controller	2013-02-05 12:54:55 +01:00
mailer	finish mailer i18n	2013-02-06 00:50:59 +01:00
messages	finish messages i18n + controller + model	2013-02-09 10:18:52 +01:00
order_comments	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
ordergroups	finish ordergroups and orders i18n + controller	2013-02-08 01:52:20 +01:00
orders	fix orders i18n	2013-02-11 15:34:31 +01:00
pages	Nice breadcrumb	2012-10-18 23:43:31 +02:00
sessions	finish sessions i18n	2013-02-04 01:46:07 +01:00
shared	fix bug in javascript i18n	2013-02-09 10:19:48 +01:00
stock_takings	finish stock_takings i18n + controller	2013-02-13 01:20:20 +01:00
stockit	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00
suppliers	finish suppliers i18n	2013-02-08 00:11:58 +01:00
tasks	Show accept/reject button in task show view.	2012-12-22 14:29:59 +01:00
workgroups	workgroups i18n	2013-02-13 01:34:58 +01:00