Maikel Linke 17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances ...

Applied code conventions.

Conflicts:
	config/locales/en.yml

2016-03-30 13:30:44 +11:00

..

admin

i18n fixes after @sstead feedback in #799

2016-03-21 16:55:57 -06:00

api

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

checkout/payment

i18n: Replacing all language strings in app/view/

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

layouts

Fixes issue #362 Change admin account link to point to account page instead of edit user.

2015-03-04 16:00:46 +11:00

order_mailer

Correcting name tag for order conf email

2016-01-25 23:50:53 +00:00

orders

Merge branch 'master' into line_item_naming

2015-11-16 10:38:42 +11:00

products

i18n: Replacing all language strings in app/view/

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

shared

Fix display of "Total"

2016-01-15 12:07:43 +11:00

user_mailer

i18n: Replacing all language strings in app/view/

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

users

Formatting credit/debit green/red

2016-03-28 20:35:14 +01:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

2013-03-08 15:18:52 +11:00