Merge pull request #2775 from dpfaffenbauer/release/4.1.0

[Release] 4.1.0
coreshop · Jan 7, 2025 · 79cd8a2 · 79cd8a2
2 parents 71589b2 + 5023a45
commit 79cd8a2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md
@@ -1,3 +1,8 @@
+# 3.2.16
+* [PimcoreBundle] fix MultiSelect (check for existing store) by @breakone in https://github.com/coreshop/CoreShop/pull/2754
+* [priceNull - 3.2] - add listener for null/empty price on field by @codingioanniskrikos in https://github.com/coreshop/CoreShop/pull/2757
+* [ResourceBundle] Version Marshalling for FieldCollections by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2768
+
 # 3.2.15
 * [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743
 

diff --git a/CHANGELOG-4.0.x.md b/CHANGELOG-4.0.x.md
@@ -1,3 +1,12 @@
+# 4.0.13
+* [Resource] fallback locale could be null for newly created entities by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2756
+* fix: CheckoutManager::getNextStep return type by @gander in https://github.com/coreshop/CoreShop/pull/2758
+* Added action price casting to int by @twin-elements in https://github.com/coreshop/CoreShop/pull/2760
+* [ResourceBundle/OrderBundle] fix order grid-configs and add a new CoreShop Resource Field Getter Operator by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2762
+* [Store] optimize Store Context resolving with fallback and admin/non-admin by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2766
+* [Store] optimize Store Context resolving with fallback and admin/non-admin also for area bricks by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2769
+* [CoreBundle] allow to pass site to link generation by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2772
+
 # 4.0.12
 
 * [PayumBundle] remove payment_state processing to confirm orders by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2743

diff --git a/CHANGELOG-4.1.x.md b/CHANGELOG-4.1.x.md
@@ -1,3 +1,8 @@
+## 4.1.0
+* [Registry] require registry 4.1 in all bundles by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2748
+* Update CartController - remove Argument Injection by @steinerCors in https://github.com/coreshop/CoreShop/pull/2741
+* [Frontend] introduce template installer and better define best-practice by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2739
+
 ## 4.1.0-RC2
 
 > **Important** The FrontendBundle is now disabled by default. We added a migration to enable it

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -26,7 +26,7 @@ final class Version
 
     public const RELEASE_VERSION = '0';
 
-    public const EXTRA_VERSION = 'RC2';
+    public const EXTRA_VERSION = '';
 
     public static function getVersion(): string
     {