Luis Ramos 4478d51aee Merge pull request #3668 from luisramos0/2-0-stable-Mar29 ...

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

2019-04-09 17:46:36 +01:00

..

assets

Fix admin menu items different heights

2019-04-01 12:11:29 +01:00

controllers

Merge pull request #3668 from luisramos0/2-0-stable-Mar29

2019-04-09 17:46:36 +01:00

helpers

Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4

2019-03-29 22:16:39 +00:00

jobs

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

2019-03-16 16:17:38 +00: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 pull request #3668 from luisramos0/2-0-stable-Mar29

2019-04-09 17:46:36 +01:00

overrides

Merge pull request #3613 from luisramos0/2-0-update-variants-stock

2019-03-26 08:55:34 +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-Mar16

2019-03-16 16:17:38 +00:00

services

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

2019-03-22 10:55:17 +00:00

validators

Add validator for integer arrays

2019-02-08 21:26:36 +00:00

views

Merge pull request #3668 from luisramos0/2-0-stable-Mar29

2019-04-09 17:46:36 +01:00