Maikel 155b205ac2 Merge pull request #3401 from luisramos0/2-0-stable-jan-29th ...

[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)

2019-01-30 14:44:40 +11:00

..

assets

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00

controllers

Merge pull request #3401 from luisramos0/2-0-stable-jan-29th

2019-01-30 14:44:40 +11:00

helpers

Merge branch 'master' into 2-0-stable-jan-11th

2019-01-11 11:58:24 +00:00

jobs

Reload order before sending emails to ensure state is up to date

2018-07-05 19:26:12 +10:00

mailers

Fix merge typo in the cancel email method of the order mailer decorator

2019-01-08 15:31:28 +00:00

models

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00

overrides

Fix variant edit page optiontype deface code

2019-01-07 12:16:47 +00:00

presenters

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

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

serializers/api

Merge branch 'master' into 2-0-stable-dec-10th

2018-12-10 16:41:29 +00:00

services

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00

validators

Fix failing tests and extract validation message Procs into methods

2017-07-21 12:17:12 +10:00

views

Merge branch 'master' into 2-0-stable-jan-29th

2019-01-29 12:38:34 +00:00