From 08979bdea500df2d30d7c939019cb8d87d70643a Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Fri, 17 Apr 2020 12:52:10 +0200 Subject: [PATCH 1/3] [2.2.0] prepare release --- CHANGELOG-2.2.x.md | 15 ++++++++++++++- .../Bundle/CoreBundle/Application/Version.php | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md index db6685bbae..db325cfd5d 100644 --- a/CHANGELOG-2.2.x.md +++ b/CHANGELOG-2.2.x.md @@ -1,5 +1,17 @@ # 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) + + - Bugs: + - [SecurityValidator] only trigger when Pimcore Frontend request (https://github.com/coreshop/CoreShop/pull/1339) + - [PimcoreBundle] fix dynamic dropdown extensions (https://github.com/coreshop/CoreShop/pull/1337) + - [Pimcore Bundle] Fix loading dynamic dropdown options (https://github.com/coreshop/CoreShop/pull/1340) + ## 2.2.0-RC.2 - Features: - [IndexBundle] allow configuring if versions should be indexed or not (https://github.com/coreshop/CoreShop/pull/1303) @@ -19,7 +31,7 @@ - [FrontendBundle/CoreBundle] prevent _fragment calls by using ACL's (https://github.com/coreshop/CoreShop/pull/1309) - [Reports] fix export params (https://github.com/coreshop/CoreShop/pull/1328) -## 2.2.0 +## 2.2.0-RC.1 - Features: - [Core] Implement Username/Email Login Identifier @solverat (https://github.com/coreshop/CoreShop/issues/1290, https://github.com/coreshop/CoreShop/pull/1291) - [Pimcore] require min Pimcore 6.5 (https://github.com/coreshop/CoreShop/pull/1286) @@ -29,5 +41,6 @@ - [PHPStan] level-3 (https://github.com/coreshop/CoreShop/pull/1220) - [Pimcore] remove pimcore bc layers (https://github.com/coreshop/CoreShop/pull/1221) - [CoreBundle] support version marshall und unmarshall to merge with existing data (https://github.com/coreshop/CoreShop/pull/1145) + - Bugs: - [CoreExtensions] fix issue with CoreShop CoreExtensions Recycle Bin (https://github.com/coreshop/CoreShop/pull/1254) diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index 25eff34bc5..90d533e321 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 = '2'; const RELEASE_VERSION = '0'; - const EXTRA_VERSION = 'RC.2'; + const EXTRA_VERSION = ''; /** * @return string From 8a0cb662603456e8994aa20967ae29355034c16a Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Thu, 30 Apr 2020 16:25:18 +0200 Subject: [PATCH 2/3] [2.2.0] prepare release - changelog --- CHANGELOG-2.2.x.md | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md index db325cfd5d..1a4ad0c6b7 100644 --- a/CHANGELOG-2.2.x.md +++ b/CHANGELOG-2.2.x.md @@ -1,17 +1,35 @@ # Within 2.2 -## 2.2.0 + +## 2.2.0-RC.2 - 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) - - [Pimcore Bundle] Fix loading dynamic dropdown options (https://github.com/coreshop/CoreShop/pull/1340) + - [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) @@ -31,7 +49,7 @@ - [FrontendBundle/CoreBundle] prevent _fragment calls by using ACL's (https://github.com/coreshop/CoreShop/pull/1309) - [Reports] fix export params (https://github.com/coreshop/CoreShop/pull/1328) -## 2.2.0-RC.1 +## 2.2.0 - Features: - [Core] Implement Username/Email Login Identifier @solverat (https://github.com/coreshop/CoreShop/issues/1290, https://github.com/coreshop/CoreShop/pull/1291) - [Pimcore] require min Pimcore 6.5 (https://github.com/coreshop/CoreShop/pull/1286) @@ -41,6 +59,5 @@ - [PHPStan] level-3 (https://github.com/coreshop/CoreShop/pull/1220) - [Pimcore] remove pimcore bc layers (https://github.com/coreshop/CoreShop/pull/1221) - [CoreBundle] support version marshall und unmarshall to merge with existing data (https://github.com/coreshop/CoreShop/pull/1145) - - Bugs: - [CoreExtensions] fix issue with CoreShop CoreExtensions Recycle Bin (https://github.com/coreshop/CoreShop/pull/1254) From 41b1239fc18e0c0e515cdd159be7cc305b079345 Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 4 May 2020 08:29:40 +0200 Subject: [PATCH 3/3] Update CHANGELOG-2.2.x.md Co-authored-by: Jacob Dreesen --- CHANGELOG-2.2.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md index 1a4ad0c6b7..4ffe77db73 100644 --- a/CHANGELOG-2.2.x.md +++ b/CHANGELOG-2.2.x.md @@ -1,7 +1,7 @@ # Within 2.2 -## 2.2.0-RC.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)