Rob Harrington c5ba0b8f8c Merge branch 'master' into 1014-image-diet

2016-06-08 15:12:33 +10:00

..

assets

Merge branch 'master' into 1014-image-diet

2016-06-08 15:12:33 +10:00

controllers

Find current_customer via current_distributor and current_user rather than current_order

2016-05-28 00:31:59 +10:00

helpers

Find current_customer via current_distributor and current_user rather than current_order

2016-05-28 00:31:59 +10:00

jobs

Run a job queue heartbeat every 5 minutes

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

mailers

Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp)

2016-06-08 11:15:02 +10:00

models

Find current_customer via current_distributor and current_user rather than current_order

2016-05-28 00:31:59 +10:00

overrides

Payment methods can be tagged

2016-05-27 16:25:10 +10:00

presenters

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

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

serializers/api

Tag Rules can be rearranged in UI to set priority

2016-05-27 16:25:10 +10:00

views

Merge remote-tracking branch 'origin/master' into HEAD

2016-06-01 12:16:10 +10:00