diff --git a/CHANGELOG-3.1.x.md b/CHANGELOG-3.1.x.md index 5f42c5a59e..9deb4bd747 100644 --- a/CHANGELOG-3.1.x.md +++ b/CHANGELOG-3.1.x.md @@ -1,3 +1,10 @@ +# 3.1.4 + +* cast trackingCode as string by @solverat in https://github.com/coreshop/CoreShop/pull/2412 +* fix comment delete request by @solverat in https://github.com/coreshop/CoreShop/pull/2407 +* [Core] add unit to GiftProductAction by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2422 +* [Cart] fix wrong decoration of cart-context by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2432 + # 3.1.3 * [Cart] fix using right context for performance increase by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2387 diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md index caa1cf4cf1..fec01030d0 100644 --- a/CHANGELOG-3.2.x.md +++ b/CHANGELOG-3.2.x.md @@ -1,6 +1,11 @@ -# 3.2.0 +# 3.2.0-beta.1 + +* [StorageListBundle] make restore cart after checkout configurable by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2428 +* [OrderEdit] don't allow cancelled orders to be editable by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2431 + +# 3.2.0-beta.1 ## Features - - [Order] Backend Order Editing by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2397, https://github.com/coreshop/CoreShop/pull/2382 +- [Order] Backend Order Editing by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2397, https://github.com/coreshop/CoreShop/pull/2382 diff --git a/CHANGELOG-4.0.x.md b/CHANGELOG-4.0.x.md index 7d79c2c1fb..7ae00b6051 100644 --- a/CHANGELOG-4.0.x.md +++ b/CHANGELOG-4.0.x.md @@ -1,3 +1,10 @@ +# 4.0.0-beta.4 +* [Pimcore11] remove o_ column usages by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2413 +* [Pimcore11] fix return type for getChildCategories by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2414 +* can not save store shop settings by @sevarozh in https://github.com/coreshop/CoreShop/pull/2415 +* [Pimcore] require Pimcore 11.1 as minimum by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2423 +* Fix error in the filter functionality for multiselects by @hethehe in https://github.com/coreshop/CoreShop/pull/2426 + # 4.0.0-beta.3 - CoreShop 4.0.0 is the same as 3.2.0 will be, it contains all bug-fixes and feature from 3.1 and 3.2 diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index eaa40317c5..cdb809eb9e 100644 --- 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 = 'beta.3'; + public const EXTRA_VERSION = 'beta.4'; public static function getVersion(): string {