Luis Ramos 6f0d155508 Merge pull request #3742 from openfoodfoundation/2-0-stable ...

Merge 2-0-stable to master

2019-05-04 00:06:27 +01:00

..

cache_settings

Add checkbox to cache settings to disable products cache

2019-02-07 20:06:27 +00: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 wrong sort predicates in customer index

2018-07-23 10:33:40 +10:00

enterprise_fees

Closes translation bug for enterprise fee settings

2019-05-01 10:43:35 -05:00

enterprise_groups

Rename "entreprise" in i18n keys to "enterprise"

2018-08-31 15:26:30 +08:00

enterprise_relationships

Rename "entreprise" in i18n keys to "enterprise"

2018-08-31 15:26:30 +08:00

enterprise_roles

Fix i18n key and spec

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

enterprises

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

2019-03-29 13:48:49 +00:00

invoice_settings

Adding feature toggle for receipt printing using qz

2017-03-15 16:39:04 +11:00

json

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

matomo_settings

Added basic integration with Matomo

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

order_cycles

Fix 'clear all' button width on Order Cycles page

2019-04-01 11:41:46 +01: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

Update references to product_sub_menu view

2019-02-26 20:06:01 +00:00

shared

Apply and delete overrides

2019-02-26 19:42:47 +00:00

stripe_connect_settings

Update helper messages in Stripe Connect config UI

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

subscriptions

Use localizeCurrency filter in subscriptions

2019-02-07 22:58:49 +00:00

variant_overrides

Fix "clear all" button spacing in inventory

2019-04-01 12:18:19 +01:00