Rohan Mitchell 213242627e Merge branch 'master' into redesign-phase-2 ...

Conflicts:
	app/views/home/_hubs.html.haml

2015-07-01 15:44:36 +10:00

..

assets

Merge branch 'master' into redesign-phase-2

2015-07-01 15:44:36 +10:00

controllers

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10:00

helpers

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes

2015-06-19 11:34:41 +10:00

overrides

Merge branch 'master' into redesign

2015-06-10 18:27:50 +10:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Use indexed_fees_for for product price

2015-06-18 13:07:52 +10:00

views

Merge branch 'master' into redesign-phase-2

2015-07-01 15:44:36 +10:00