luisramos0 90d7b7f4a0 Merge branch 'master' into 2-0-stable-oct-25

2018-10-25 14:28:58 +01:00

..

assets

Remove order admin page filter 'show only unfulfilled orders' as done on spree 2

2018-10-20 15:11:47 +01:00

controllers

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

2018-10-25 14:28:58 +01:00

helpers

Merge pull request #2521 from luisramos0/cookies_in_engine

2018-10-15 10:03:30 +02: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-oct-25

2018-10-25 14:28:58 +01: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

Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2

2018-10-22 11:24:01 +01:00

services

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

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

validators

Fix failing tests and extract validation message Procs into methods

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

views

Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin

2018-10-23 18:59:01 +02:00