foodsoft/app/views
wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02: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 use short form plus title for unit quantity 2013-04-04 00:24:14 +02: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 Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
foodcoop finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
group_orders Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
home Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +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 Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +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 Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
pages Fixed wiki site-map, when there is no homepage. 2013-03-17 17:57:35 +01:00
sessions Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-04 00:29:50 +02:00
shared fix bug in javascript i18n 2013-02-09 10:19:48 +01:00
stock_takings Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
stockit i18n last merge 2013-03-06 01:24:57 +01:00
suppliers Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +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