Maikel 2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th ...

[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)

2018-11-15 15:02:21 +11:00

..

assets

Merge branch 'master' into 2-0-stable-nov-8th

2018-11-08 11:18:54 +00:00

controllers

Use logged in user (spree_current_user) for API authentication (current_api_user)

2018-11-14 11:58:28 +01:00

helpers

Remove admin order #show link from helper

2018-11-06 11:03:06 +00:00

jobs

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

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

mailers

Merge branch 'master' into 2-0-stable-oct

2018-10-15 17:09:26 +01:00

models

Merge branch 'master' into 2-0-stable-nov-14th

2018-11-14 11:35:58 +00:00

overrides

Merge branch 'master' into 2-0-stable-oct

2018-10-15 17:09:26 +01:00

presenters

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

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

serializers/api

Merge pull request #2998 from coopdevs/adapt-product-on-demand

2018-11-08 19:21:46 +00:00

services

Merge branch 'master' into 2-0-stable-nov-8th

2018-11-08 11:18:54 +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-nov-14th

2018-11-14 11:35:58 +00:00