Steve Pettitt b324207121 Merge current master

2016-03-10 21:48:13 +00:00

..

assets

Auto-merged master into uk/account-balances on deployment.

2016-03-09 14:43:05 +11:00

controllers

Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.

2016-03-02 12:10:22 +11:00

helpers

Merge current master

2016-03-10 21:48:13 +00:00

jobs

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

mailers

Cleaning up and attempt to add feature spec

2016-01-15 09:07:49 +11:00

models

Merge current master

2016-03-10 21:48:13 +00:00

overrides

Renaming 'Variant Overrides' index page to 'Inventory'

2016-03-02 12:10:22 +11:00

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Auto-merged master into uk/account-balances on deployment.

2016-03-09 14:43:05 +11:00

views

Auto-merged master into uk/account-balances on deployment.

2016-03-09 14:43:05 +11:00