Merge pull request #1352 from dpfaffenbauer/release/2.2

[2.2.0] prepare release

CHANGELOG-2.2.x.md

@@ -1,5 +1,35 @@
 # Within 2.2
 
+
+## 2.2.0
+ - Features:
+    - [Order] don't allow order-revise when completed payment has been made (https://github.com/coreshop/CoreShop/pull/1334)
+    - [Order] persist internal cancellation reasons (https://github.com/coreshop/CoreShop/pull/1333)
+    - [Pimcore] require min 6.6 (https://github.com/coreshop/CoreShop/pull/1338)
+    - [GithubAction] add stan test (https://github.com/coreshop/CoreShop/pull/1341)
+    - [OrderBundle] show price rules without tax in backend (https://github.com/coreshop/CoreShop/pull/1346)
+    - [ThemeBundle] introduce theme inheritance (https://github.com/coreshop/CoreShop/pull/1353, https://github.com/coreshop/CoreShop/pull/1359)
+    - [Order] introduce paymentTotal Property to store the rounded payment value with a precision of 2 (https://github.com/coreshop/CoreShop/pull/1360)
+    - [Order] use Javascript intl for currency format (https://github.com/coreshop/CoreShop/pull/1366)
+    - [FrontendBundle] allow preview from admin-mode and redirect to right URL if wrong (https://github.com/coreshop/CoreShop/pull/1367)
+
+ - Bugs:
+    - [SecurityValidator] only trigger when Pimcore Frontend request (https://github.com/coreshop/CoreShop/pull/1339)
+    - [PimcoreBundle] Fix loading dynamic dropdown options (https://github.com/coreshop/CoreShop/pull/1340)
+    - [PimcoreBundle] fix dynamic dropdown extensions (https://github.com/coreshop/CoreShop/pull/1337)
+    - [PimcoreBundle] Fix data persistence for class definition and database (https://github.com/coreshop/CoreShop/pull/1343)
+    - [PimcoreBundle] add dependency resolving (https://github.com/coreshop/CoreShop/pull/1348)
+    - [CoreBundle] add missing alias for taxed product price calculator (https://github.com/coreshop/CoreShop/pull/1355)
+    - [Migration] move migration before other migration in order to avoid missing db columns (https://github.com/coreshop/CoreShop/pull/1356)
+    - [Payment] Revert "decouple Payment from Payum and consider decimal factor" (https://github.com/coreshop/CoreShop/pull/1358)
+    - [Pimcore] fix getDataForEditmode (https://github.com/coreshop/CoreShop/pull/1361)
+    - [ThemeBundle] fix pimcore bc-break (https://github.com/coreshop/CoreShop/pull/1363)
+    - [Product] serialize stopPropogation property (https://github.com/coreshop/CoreShop/pull/1365)
+    - [Product] fix null value for pricing (https://github.com/coreshop/CoreShop/pull/1370)
+    - [ResourceBundle] ignore length for name of CoreShop doctrine assets (also fixes the error on cancel) (https://github.com/coreshop/CoreShop/pull/1369)
+    - [CoreBundle] only show restore-inheritance when actually inheritable (https://github.com/coreshop/CoreShop/pull/1368)
+
+
 ## 2.2.0-RC.2
  - Features:
     - [IndexBundle] allow configuring if versions should be indexed or not (https://github.com/coreshop/CoreShop/pull/1303)

src/CoreShop/Bundle/CoreBundle/Application/Version.php

@@ -17,7 +17,7 @@ final class Version
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '2';
     const RELEASE_VERSION = '0';
-    const EXTRA_VERSION = 'RC.2';
+    const EXTRA_VERSION = '';
 
     /**
      * @return string