Skip to content

Commit

Permalink
Release v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
NikolaIvanovski committed Oct 14, 2024
1 parent fa33b6e commit a668709
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: Auto trigger on push or pull requests

on:
pull_request: {}
push: {}
push:
branches:
- 'b-7.2.x*'

jobs:
php82_mysql80:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [2.1.0] - Unreleased
## [2.1.0] - 2024-10-14

### Changed
- Upgrade phpunit to 11.x
Expand Down Expand Up @@ -51,6 +51,6 @@ Module extracted from wysiwyg module, and used by it now
- Thumbnails are generated on demand and the type of thumbnail file is matching the original image type
- Alternative image directory setting renamed to fit its functionality: Alternative image URL

[2.1.0]: https://github.com/OXID-eSales/media-library-module/compare/b-7.1.x..b-7.2.x
[2.1.0]: https://github.com/OXID-eSales/media-library-module/compare/v2.0.0..v2.1.0
[2.0.0]: https://github.com/OXID-eSales/media-library-module/compare/v1.0.0..v2.0.0
[1.0.0]: https://github.com/OXID-eSales/media-library-module/compare/f18ab07..v1.0.0
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Media Library Module for OXID eShop

[![Development](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.1.x)](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml)
[![Development](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.2.x)](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml)
[![Latest Version](https://img.shields.io/packagist/v/OXID-eSales/media-library-module?logo=composer&label=latest&include_prereleases&color=orange)](https://packagist.org/packages/oxid-esales/media-library-module)
[![PHP Version](https://img.shields.io/packagist/php-v/oxid-esales/media-library-module)](https://github.com/oxid-esales/media-library-module)

Expand All @@ -13,6 +13,7 @@ Module provides basic media files management.
## Compatibility

### Versions
* v2.1.x is compatible with eShop compilation 7.2.x and higher
* v2.0.x is compatible with eShop compilation 7.1.x and higher
* v1.0.x is compatible with eShop compilation 7.1.x and higher

Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
"OxidEsales\\MediaLibrary\\Tests\\": "./tests"
}
},
"conflict": {
"oxid-esales/oxideshop-ce": "<7.2"
},
"scripts": {
"phpcs": "phpcs --standard=tests/phpcs.xml --report=full",
"phpcs-report": "phpcs --standard=tests/phpcs.xml --report=json --report-file=phpcs.report.json",
Expand Down
2 changes: 1 addition & 1 deletion metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
'en' => '',
],
'thumbnail' => 'logo.png',
'version' => '2.0.0',
'version' => '2.1.0',
'author' => 'OXID eSales AG & digidesk - media solutions',
'url' => 'https://www.oxid-esales.com',
'email' => '[email protected]',
Expand Down

0 comments on commit a668709

Please sign in to comment.