Luis Ramos edaf2479dc Merge pull request #3741 from luisramos0/2-0-stable-Apr15 ...

[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)

2019-05-02 11:26:54 +01:00

..

assets

Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug

2019-04-16 15:28:43 +01:00

controllers

Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees

2019-04-10 21:58:22 +01:00

helpers

Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments

2019-04-10 21:44:16 +01:00

jobs

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

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

mailers

Fix translation problem in the subject of order confirmation emails

2019-04-04 12:55:36 +01:00

models

Merge pull request #3741 from luisramos0/2-0-stable-Apr15

2019-05-02 11:26:54 +01:00

overrides

Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management"

2019-04-02 16:58:50 +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 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 #3701 from luisramos0/2-0-fix-order-edit-issues

2019-04-19 07:33:26 +10:00