From 80d8dad1cba70b28e123945d3d7e0b63da7d9881 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Tue, 15 Oct 2019 15:47:05 +0200 Subject: [PATCH] [2.1.0-rc.2] prepare release --- CHANGELOG-2.0.x.md | 4 ++++ CHANGELOG-2.1.x.md | 16 ++++++++++++++++ .../Bundle/CoreBundle/Application/Version.php | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-2.0.x.md b/CHANGELOG-2.0.x.md index f453e8a0ed..df0022392e 100644 --- a/CHANGELOG-2.0.x.md +++ b/CHANGELOG-2.0.x.md @@ -1,5 +1,9 @@ # Within V2 +## 2.0.10 + - Bugs: + - [PayumBundle]: add sandbox to PayPal Configuration (https://github.com/coreshop/CoreShop/pull/1112) + ## 2.0.9 - Bugs: - [Pimcore] fix stan tests on 2.0 (https://github.com/coreshop/CoreShop/pull/998) diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md index e22e4f37f2..6db230a554 100644 --- a/CHANGELOG-2.1.x.md +++ b/CHANGELOG-2.1.x.md @@ -1,5 +1,21 @@ # Within 2.1 +## 2.1.0-rc.2 + - Features: + - [IndexBundle] allow for more complex doctrine types in index (https://github.com/coreshop/CoreShop/pull/1110) + - [IndexBundle] add Select and Multiselect Filter Processor from Multiselect (https://github.com/coreshop/CoreShop/pull/1111) + - [Autowire] improvement: allow service registries to be autowired (https://github.com/coreshop/CoreShop/pull/1113, https://github.com/coreshop/CoreShop/pull/1116, https://github.com/coreshop/CoreShop/pull/1122) + - [QuantityPriceRules] allow price range ordering @solverat (https://github.com/coreshop/CoreShop/pull/1121) + - [Payment] Fix payment provider logo @davidhoeck (https://github.com/coreshop/CoreShop/pull/1124) + - [ResourceBundle, OrderBundle, CoreBundle] introduce more memory efficient (https://github.com/coreshop/CoreShop/pull/1126, https://github.com/coreshop/CoreShop/pull/1129) + - [Shipping, ShippingBundle] Add logo field to carrier @davidhoeck (https://github.com/coreshop/CoreShop/pull/1127) + - + + - Bugs: + - [Tests] exit code (https://github.com/coreshop/CoreShop/pull/1119) + - [Tracking] remove decimal factor multiplier in order extractor @solverat (https://github.com/coreshop/CoreShop/pull/1128) + - [QuantityPriceRules] Move migration for Quantity Rule Range Unit to Sales Unit migration (https://github.com/coreshop/CoreShop/pull/1123) + s ## 2.1.0 - BC-Break: Introduced `array $options` parameter into `CoreShop\Component\Index\Listing\ListingInterface` to allow certain variations for loading data diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index 0375c38a49..28dcd17ab2 100644 --- a/src/CoreShop/Bundle/CoreBundle/Application/Version.php +++ b/src/CoreShop/Bundle/CoreBundle/Application/Version.php @@ -17,7 +17,7 @@ final class Version const MAJOR_VERSION = '2'; const MINOR_VERSION = '1'; const RELEASE_VERSION = '0'; - const EXTRA_VERSION = 'rc.1'; + const EXTRA_VERSION = 'rc.2'; /** * @return string