Maikel Linke 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ...

Conflicts:
	app/views/shared/menu/_cart.html.haml
	app/views/spree/order_mailer/confirm_email_for_shop.html.haml

2015-09-16 16:32:16 +10:00

..

admin

Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements

2015-09-10 16:05:28 +10:00

api

Auto-merge from CI [skip ci]

2015-08-28 17:04:53 +10: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

Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views

2015-09-16 16:32:16 +10:00

orders

i18n: Replacing all language strings in app/view/

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

products

i18n: Replacing all language strings in app/view/

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

shared

i18n: Replacing all language strings in app/view/

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

user_mailer

i18n: Replacing all language strings in app/view/

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

users

This changes the user menu labels to show Account next to user email.

2015-03-13 16:49:26 +11:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

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