Pau Pérez Fabregat 99ba9d7d1b Merge branch '2-0-stable' into unit-test-variant-stock

2018-09-19 15:41:21 +02:00

..

assets

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

2018-09-04 17:43:20 +01:00

controllers

The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.

2018-08-31 11:23:11 +10:00

helpers

Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user

2018-09-03 14:38:56 +10: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-sept

2018-09-04 17:43:20 +01:00

models

Merge branch '2-0-stable' into unit-test-variant-stock

2018-09-19 15:41:21 +02:00

overrides

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

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

presenters

Adding option to 'Inherit From Product' for enterprise_fee tax categories

2016-03-02 11:56:46 +11:00

serializers/api

Style proxy order serializer

2018-08-03 15:07:22 +10:00

services

CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly

2018-09-10 10:21:23 +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 #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user

2018-09-03 14:38:56 +10:00