Luis Ramos f34f693620 Merge branch 'master' into 3-0-stable-may-22

2020-05-22 22:54:19 +01:00

..

contents

Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu

2019-03-12 19:11:37 +00:00

customers

Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller

2019-09-11 10:32:30 +01:00

enterprise_fees

Make enterprise fees name placeholder translatable

2019-05-29 21:33:30 +01:00

enterprise_groups

Make all calls to content_for use dash not equals when setting content_for

2019-10-23 12:42:29 +01:00

enterprise_relationships

Update _enterprise_relationship.html.haml

2020-04-15 17:01:22 -05:00

enterprise_roles

Fix i18n key and spec

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

enterprises

Add warning message to enterprise ship methods list and ship method edit page

2020-05-21 10:47:22 +01:00

invoice_settings

Add new preference to invoice settings: enable invoices

2019-06-19 13:29:30 +01:00

json

Fix broken html encoding of injected json in admin views

2020-02-22 11:06:51 +00:00

matomo_settings

Added basic integration with Matomo

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

order_cycles

fix ampersand problem using ng-bind-html

2020-03-01 17:54:36 -03:00

producer_properties

Revert "Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR"

2017-09-08 23:55:50 +10:00

product_import

Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial

2019-10-23 12:26:18 +01:00

shared

Make all calls to content_for use dash not equals when setting content_for

2019-10-23 12:42:29 +01:00

stripe_connect_settings

Update helper messages in Stripe Connect config UI

2017-10-16 10:37:04 +11:00

subscriptions

Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller

2019-09-11 10:32:30 +01:00

variant_overrides

fix ampersand problem using ng-bind-html

2020-03-01 17:54:36 -03:00