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

..

components

i18n: Replacing all language strings in app/view/

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

mailers

i18n: Replacing all language strings in app/view/

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

menu

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

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

_account_sidebar.html.haml

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

_analytics.html.haml

Only record analytics in production. Also record them in admin backend.

2015-06-03 16:36:31 +10:00

_case_study.html.haml

i18n: Replacing all language strings in app/view/

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

_cms_elrte_head.html.haml

Ensure css is precompiled, reformat configs

2013-11-01 16:22:54 +11:00

_copyright.html.haml

Removing the footer cruft

2014-02-04 14:50:18 +11:00

_distributor.html.haml

Replacing all uses of the old enterprise shop url helper

2015-01-22 10:19:43 +11:00

_footer.html.haml

i18n: Replacing all language strings in app/view/

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

_ie_warning.html.haml

i18n: Replacing all language strings in app/view/

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

_login.html.haml

i18n: Replacing all language strings in app/view/

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

_sidebar.html.haml

Removing pointless foundation crud, reworking the login

2014-05-06 18:28:20 +10:00

_signed_in_offcanvas.html.haml

i18n: Replacing all language strings in app/view/

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

_signed_in.html.haml

i18n: Replacing all language strings in app/view/

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

_signed_out.html.haml

i18n: Replacing all language strings in app/view/

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

_validated_input.html.haml

Adding icons to checkout, focusing on first input in each panel when selected

2014-04-16 16:07:19 +10:00

_validated_select.html.haml

Display errors on checkout State field

2014-11-06 18:29:48 +11:00

unauthorized.html.haml

i18n: Replacing all language strings in app/view/

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