Maikel Linke 5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n ...

Conflicts:
	config/locales/en.yml

2015-11-13 10:07:29 +11:00

..

admin

Merge branch 'master' into folklabs-producer-emails

2015-10-16 12:38:54 +11:00

api

Order cycle filter resets date filters on BOM

2015-05-07 12:50:55 +10:00

checkout

i18n typo

2015-11-05 14:39:33 +11:00

enterprise_mailer

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

enterprises

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

groups

i18n more content

2015-10-22 11:03:35 +11:00

home

Fixed several i18n issues reported by Myriam

2015-10-29 14:55:38 +11:00

json

Making sure flash is a hash so that is can be used to initialize OpenStuct

2015-11-05 11:09:21 +11:00

layouts

locale data as js asset

2015-10-01 15:54:46 +10:00

map

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

modals

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

open_food_network

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

order_cycles

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

producer_mailer

Display more verbose product and variant name

2015-11-05 09:50:00 +11:00

producers

Fixed several i18n issues reported by Myriam

2015-10-29 14:55:38 +11:00

products

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

registration

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

shared

Fixed several i18n issues reported by Myriam

2015-10-29 14:55:38 +11:00

shop

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

shopping_shared

fix i18n typo

2015-09-02 16:58:04 +10:00

shops

i18n: Replacing all language strings in app/view/

2015-08-28 16:59:23 +10:00

spree

Merge remote-tracking branch 'origin/master' into i18n

2015-11-13 10:07:29 +11:00

user_passwords

Removing nothing special text and patching change password form slightly more

2014-04-08 18:07:55 +10:00