foodsoft/app/views
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
..
admin Merge remote-tracking branch 'fsmanuel/master' into master. 2013-07-18 18:48:49 +02:00
article_categories start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
articles fix category heading 2013-10-10 19:22:43 +02:00
deliveries Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
feedback i18n feedback + controller 2013-02-09 13:01:44 +07:00
finance Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
foodcoop i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
group_orders Merge branch 'master' into i18n 2013-10-09 23:57:43 +02:00
home move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
invites small i18n update 2013-10-02 17:08:24 +02:00
kaminari Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
layouts use i18n-js 2013-10-04 15:01:10 +02:00
login move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
mailer beautify order mail 2013-06-29 02:54:00 +02:00
messages move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
order_comments Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
ordergroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
orders Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
pages fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
sessions do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone 2013-06-26 00:42:09 +02:00
shared fix haml indentation errors 2013-10-17 16:35:50 +02:00
stock_takings clean up price tooltips javascript 2013-10-09 10:43:41 +02:00
stockit fix stockit i18n reference 2013-10-10 19:23:37 +02:00
suppliers Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
tasks i18n simple_form move of tasks 2013-10-09 22:41:23 +02:00
workgroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00