Merge branch 'rel_1.x' into dev_1.x_tests

# Conflicts:
#	composer.json
This commit is contained in:
Daniel Seifert 2023-01-03 09:38:09 +01:00
commit 1558e0275e
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
3 changed files with 16 additions and 4 deletions

View File

@ -4,7 +4,19 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased](https://git.d3data.de/D3Private/linkmobility4oxid/compare/1.1.0.1...rel_1.x)
## [Unreleased](https://git.d3data.de/D3Private/linkmobility4oxid/compare/1.1.1.0...rel_1.x)
## [1.1.1.0](https://git.d3data.de/D3Private/linkmobility4oxid/compare/1.1.0.1...1.1.1.0) - 2023-01-01
### Added
- make installable in OXID 6.5.1 (CE 6.13)
- add linkmobility to remark types in installation triggers
- regenerate database views in installation process
### Changed
- adjust requirements
### Fixed
- fix error if configuration is missing
## [1.1.0.1](https://git.d3data.de/D3Private/linkmobility4oxid/compare/1.1.0.0...1.1.0.1) - 2022-09-29
### Changed

View File

@ -22,9 +22,9 @@
],
"require": {
"php": "^7.1 || ^8.0",
"oxid-esales/oxideshop-ce": "6.7 - 6.13",
"oxid-esales/oxideshop-ce": "~6.7.0 || ~6.9.0 || 6.10 - 6.13",
"d3/linkmobility-php-client": "^1.2.0 || ^2.0.0",
"d3/oxid-dic-handler": "*"
"d3/oxid-dic-handler": "*"
},
"require-dev": {
"oxid-esales/oxideshop-ce": "~6.10.0",

View File

@ -37,7 +37,7 @@ $aModule = [
'de' => 'Anbindung der LINK Mobility API (Nachrichtenversand per SMS) an den Shop',
'en' => 'Connection of the LINK Mobility API ( sending messages via SMS) to the shop',
],
'version' => '1.1.0.0',
'version' => '1.1.1.0',
'thumbnail' => 'picture.png',
'author' => 'D³ Data Development (Inh.: Thomas Dartsch)',
'email' => 'support@shopmodule.com',