Matt-Yorkley 27903ab744 Merge branch 'master' into uk/switcher

2017-01-22 18:57:25 +00:00

..

assets

Merge branch 'master' into uk/switcher

2017-01-22 18:57:25 +00:00

controllers

#1027: Use url helpers for basic pages

2017-01-12 10:18:30 +00:00

helpers

Include E2E permissions

2017-01-22 18:42:23 +00:00

jobs

Run a job queue heartbeat every 5 minutes

2016-04-13 16:48:24 +10:00

mailers

Fix OrderMailer#find_order

2016-11-04 09:39:17 +11:00

models

Enterprise distributing_products scope uses INNER JOINS instead of OUTER JOINS

2017-01-17 19:28:21 +11:00

overrides

Disabling override the adds coupon field to cart page

2016-11-30 18:30:20 +11:00

presenters

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

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

serializers/api

Cache enterprise supplied and distributed properties and producer properties

2016-11-25 14:14:42 +11:00

views

Merge branch 'master' into uk/switcher

2017-01-22 18:57:25 +00:00