Merge pull request #1496 from dpfaffenbauer/release/2.2.5

[2.2.5] prepare release
coreshop · Oct 9, 2020 · 36fcae9 · 36fcae9
2 parents 35d5d8a + e989b88
commit 36fcae9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md
@@ -1,5 +1,20 @@
 # Within 2.2
 
+## 2.2.5
+ - Bugs:
+     - [OrderBundle] fix permission keys for order-creation (https://github.com/coreshop/CoreShop/pull/1474)
+     - [ProductBundle] fix persistance of spefiic-product-price-rule label (https://github.com/coreshop/CoreShop/pull/1472)
+     - [OrderBundle] remove 'applyOn' from DiscountPercent and SurchagePercent (https://github.com/coreshop/CoreShop/pull/1479)
+     - [QPR] Wrong Pseudo-Price in Grid-View (https://github.com/coreshop/CoreShop/issues/1488)
+     - [Pimcore] fix hasDefinition with pimcore.implementation_loader.document.tag (https://github.com/coreshop/CoreShop/pull/1490)
+     - [OrderBundle, LocaleBundle] fix backend order-creation localeCode selection (https://github.com/coreshop/CoreShop/pull/1481)
+     - [CoreBundle] fix setting price-values for inherited store-values (https://github.com/coreshop/CoreShop/pull/1491)
+     - [CoreBundle] don't set product for store-values on pre-get-data (https://github.com/coreshop/CoreShop/pull/1492)
+
+ - Features:
+     - [Core] pass cart-item to price calculation context (https://github.com/coreshop/CoreShop/pull/1482)
+     - [Index] allow to define column config with index-extensions (https://github.com/coreshop/CoreShop/pull/1494)
+
 ## 2.2.4
  - Bugs:
     - [CoreBundle] Don't validate maximum or minimum order quantity when value is 0 (https://github.com/coreshop/CoreShop/issues/1467, https://github.com/coreshop/CoreShop/pull/1468)

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -16,7 +16,7 @@ final class Version
 {
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '2';
-    const RELEASE_VERSION = '4';
+    const RELEASE_VERSION = '5';
     const EXTRA_VERSION = '';
 
     /**