Commit 6d698e82 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.29.4'

parents bb6f981b d8165ead
Pipeline #29509866 passed with stages
in 14 minutes and 6 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.29.3';
const VERSION = '4.29.4';
/**
* Performs some startup checks.
......
......@@ -15,8 +15,6 @@
},
"require": {
"php": "^7.1",
"ext-gd": "*",
"ext-SimpleXML": "*",
"acp3/composer-installer": "^1.0",
"doctrine/dbal": "^2.5",
"doctrine/cache": "^1.6",
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"google/recaptcha": "^1.2.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/module-categories": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"acp3/module-categories": "^4.29.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/module-categories": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"acp3/module-categories": "^4.29.4"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-users": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-users": "^4.29.4"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3"
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"ckeditor/ckeditor": "dev-full/4.10.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3",
"acp3/setup": "^4.29.3",
"acp3/module-errors": "^4.29.3",
"acp3/module-permissions": "^4.29.3",
"acp3/module-system": "^4.29.3",
"acp3/module-users": "^4.29.3",
"acp3/core": "^4.29.4",
"acp3/setup": "^4.29.4",
"acp3/module-errors": "^4.29.4",
"acp3/module-permissions": "^4.29.4",
"acp3/module-system": "^4.29.4",
"acp3/module-users": "^4.29.4",
"tinymce/tinymce": "^4.8"
},
"autoload": {
......
......@@ -4,6 +4,10 @@ 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/).
## [4.29.4] - 2018-09-05
### Fixed
- removed the ext-* nodes from the composer.json
## [4.29.3] - 2018-09-05
### Fixed
- fixed the PHPUnit version of the `acp3/test` package
......@@ -683,7 +687,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- It should be possible again to save ACL roles
- Silenced a possible PHP warning when trying to login with incorrect credentials
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.29.3...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.29.4...HEAD
[4.29.4]: https://gitlab.com/ACP3/cms/compare/v4.29.3...v4.29.4
[4.29.3]: https://gitlab.com/ACP3/cms/compare/v4.29.2...v4.29.3
[4.29.2]: https://gitlab.com/ACP3/cms/compare/v4.29.1...v4.29.2
[4.29.1]: https://gitlab.com/ACP3/cms/compare/v4.29.0...v4.29.1
......
......@@ -17,8 +17,6 @@
"prefer-stable": true,
"require": {
"php": "^7.1",
"ext-gd": "*",
"ext-SimpleXML": "*",
"ckeditor/ckeditor": "dev-full/4.10.x",
"cocur/slugify": "^3.0",
"composer/semver": "^1.4",
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "3bd4c4224d2a3bc1b33a2ad27b9fd39c",
"content-hash": "728a38b0f623149ab77f082a77be5099",
"packages": [
{
"name": "ckeditor/ckeditor",
......@@ -5761,9 +5761,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^7.1",
"ext-gd": "*",
"ext-simplexml": "*"
"php": "^7.1"
},
"platform-dev": []
}
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.3"
"acp3/core": "^4.29.4"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.29.3",
"version": "4.29.4",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment