Merge pull request #1229 from dpfaffenbauer/release/2.1.1

[2.1.1] prepare release
coreshop · Jan 14, 2020 · c18a2ba · c18a2ba
2 parents 2843cb2 + 7d5da44
commit c18a2ba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,28 @@
 # Within 2.1
 
+## 2.1.1
+ - Features:
+    - [CoreBundle] Implement Variant Unit and QPR Solidifier (https://github.com/coreshop/CoreShop/issues/1157)
+    - [AddressBundle] Improve Country Address Formatting (https://github.com/coreshop/CoreShop/pull/1153)
+    - [OrderBundle] properly implement AddMultipleToCart (https://github.com/coreshop/CoreShop/pull/1154)
+    - [IndexBundle] allow to query relations also by relation type (https://github.com/coreshop/CoreShop/pull/1156)
+    - [SEOBundle] add priority to extractors (https://github.com/coreshop/CoreShop/pull/1155)
+    - [QuantityPriceRules] Allow Object Deletion without removing QPR first (https://github.com/coreshop/CoreShop/issues/1160)
+    - [CoreBundle] Improve Unit Definition <=> QPR Dependency (https://github.com/coreshop/CoreShop/pull/1161)
+    - [StorageList] introduce service to resolve if cart-items are equal (https://github.com/coreshop/CoreShop/pull/1188)
+    - [OrderBundle] Allow Item Data per Row in Order Overview (https://github.com/coreshop/CoreShop/pull/1193)
+    - [OrderBundle] add sale-detail event (https://github.com/coreshop/CoreShop/pull/1192)
+    - [IndexBundle] Argument for re-index command (https://github.com/coreshop/CoreShop/pull/1219)
+    - [CoreBundle] Maximum Quantity to Order (https://github.com/coreshop/CoreShop/issues/1209)
+
+ - Bugs:
+    - [StoreBundle] add missing store dependency (https://github.com/coreshop/CoreShop/pull/1159)
+    - [Install] add dummy migration (https://github.com/coreshop/CoreShop/pull/1172)
+    - [CoreBundle] Remove Store Values after Store has been removed (https://github.com/coreshop/CoreShop/pull/1171)
+    - [Order] Fix Character Length Count in Voucher Code Generator (https://github.com/coreshop/CoreShop/pull/1194/files)
+    - [Order] fix item price for items without tax-rule (https://github.com/coreshop/CoreShop/pull/1200)
+    - [TRACKING] use single item price in order item extractor (https://github.com/coreshop/CoreShop/pull/1232)
+
 ## 2.1.0
  - If you have a custom validation File for *AddToCart* or *Cart*, make sure to use the new 2 MinimumQuantity and MaximumQuantity Constraints. Otherwise it will happen that a validation is triggered twice.
 

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 = '1';
-    const RELEASE_VERSION = '0';
+    const RELEASE_VERSION = '1';
     const EXTRA_VERSION = '';
 
     /**