luisramos0 6fc3562a73 Merge branch 'master' into 2-0-stable-dec-18th

2018-12-18 23:32:45 +00:00

..

adjustments

Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.

2015-11-11 11:53:04 +11:00

general_settings/edit

Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)

2018-08-14 10:01:48 +10:00

image_settings/edit

Replace with-tip with ofn-with-tip: misc

2016-02-24 11:26:37 +11:00

orders

Import Spree views for orders#edit in our codebase and integrate deface modifications

2018-11-28 10:31:47 +01:00

payment_methods/index

Import payment_methods edit view and apply overrides

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

payments/new

PR changes - erb to haml, don't update en_GB translations

2018-08-19 10:43:53 +01:00

product_properties

Translate inherits_properties label in product form

2018-09-08 01:37:57 +08:00

shared

Added basic integration with Matomo

2018-08-10 16:12:58 +10:00

shipping_categories

Extract translations from serializers and overrides

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

variants

Bootstrap angular module in new_variant form

2017-11-10 09:37:36 +11:00