From fdb053eaf5c21853c963b2121dae74ba42403b70 Mon Sep 17 00:00:00 2001 From: Nikola Ivanovski Date: Mon, 14 Oct 2024 16:22:14 +0300 Subject: [PATCH] Release v4.1.0 --- .github/workflows/trigger.yaml | 4 +++- CHANGELOG.md | 5 +++-- README.md | 4 +++- composer.json | 2 +- metadata.php | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml index 772387a..c432077 100644 --- a/.github/workflows/trigger.yaml +++ b/.github/workflows/trigger.yaml @@ -3,7 +3,9 @@ name: Auto trigger on push or pull requests on: pull_request: {} - push: {} + push: + branches: + - 'b-7.2.x**' jobs: module-gdproptin: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7456e8e..c180001 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [v4.1.0] - Unreleased +## [v4.1.0] - 2024-10-14 ### Added - User Data Export Feature**: Administrators can now export a user's personal data as a ZIP file, encompassing all available information related to that user. @@ -151,7 +151,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - The GDPR Opt-In Module was fully ported as described in [modules porting guide](https://docs.oxid-esales.com/developer/en/6.0/update/eshop_from_53_to_6/modules.html). -[v4.0.0]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v3.0.1...b-7.1.x +[v4.1.0]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v4.0.0...v4.1.0 +[v4.0.0]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v3.0.1...v4.0.0 [v3.0.1]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v3.0.0...v3.0.1 [v3.0.0]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v2.3.3...v3.0.0 [v2.3.4]: https://github.com/OXID-eSales/gdpr-optin-module/compare/v2.3.3...b-6.x diff --git a/README.md b/README.md index 49ab7c6..068c4c3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # GDPR opt-in module -[![Development](https://github.com/OXID-eSales/gdpr-optin-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.1.x)](https://github.com/OXID-eSales/gdpr-optin-module/actions/workflows/trigger.yaml) +[![Development](https://github.com/OXID-eSales/gdpr-optin-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.2.x)](https://github.com/OXID-eSales/gdpr-optin-module/actions/workflows/trigger.yaml) [![Latest Version](https://img.shields.io/packagist/v/OXID-eSales/gdpr-optin-module?logo=composer&label=latest&include_prereleases&color=orange)](https://packagist.org/packages/oxid-esales/gdpr-optin-module) [![PHP Version](https://img.shields.io/packagist/php-v/oxid-esales/gdpr-optin-module)](https://github.com/oxid-esales/gdpr-optin-module) @@ -16,6 +16,7 @@ System requirements and installation instructions are described in the module do ### Compatibility +* b-7.2.x module branch for shop 7.2.x branches and compilations * b-7.1.x module branch for shop 7.1.x branches and compilations * b-7.0.x module branch for shop 7.0.x branches and compilations * b-6.x module branch for shop compilation: 6.2.x and up to 6.5.x @@ -27,6 +28,7 @@ System requirements and installation instructions are described in the module do * **composer require oxid-esales/gdpr-optin-module:^2.3.0** to install the released version compatible with OXID eShop 6.2.x - 6.5.x compilations * **composer require oxid-esales/gdpr-optin-module:^3.0.0** to install the released version compatible with OXID eShop 7.0.x compilations * **composer require oxid-esales/gdpr-optin-module:^4.0.0** to install the released version compatible with OXID eShop 7.1.x compilations +* **composer require oxid-esales/gdpr-optin-module:^4.1.0** to install the released version compatible with OXID eShop 7.2.x compilations ### Features diff --git a/composer.json b/composer.json index fbf85d4..b49f34d 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "oxid-esales/developer-tools": "dev-b-7.2.x" }, "conflict": { - "oxid-esales/oxideshop-ce": "<7.0" + "oxid-esales/oxideshop-ce": "<7.2" }, "autoload": { "psr-4": { diff --git a/metadata.php b/metadata.php index 395279d..46e859d 100644 --- a/metadata.php +++ b/metadata.php @@ -46,7 +46,7 @@ 'en' => 'This module provides the opt-in functionality for the European General Data Protection Regulation (GDPR)', ], 'thumbnail' => 'logo.png', - 'version' => '4.0.0', + 'version' => '4.1.0', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com/', 'email' => '',