Lynne Davis dc95167f15 Adding bits missed from the last commit. ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb

2015-07-15 14:44:49 +10:00

..

assets

Add error checking to client-side permalink service

2015-07-10 09:42:09 +10:00

controllers

Adding bits missed from the last commit.

2015-07-15 14:44:49 +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

Adding bits missed from the last commit.

2015-07-15 14:44:49 +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

Adding packing reports as required by the UK contingent

2015-07-15 14:44:49 +10:00