Commit 02a383f5 authored by Tino Goratsch's avatar Tino Goratsch

Merge tag 'v4.25.2' into develop

v4.25.2
parents c78140cc 6368ae7d
Pipeline #19039334 failed with stages
in 7 minutes and 51 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.25.1';
const VERSION = '4.25.2';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"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.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"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.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/module-categories": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"acp3/module-categories": "^4.25.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"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.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/module-categories": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"acp3/module-categories": "^4.25.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"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.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -7,8 +7,8 @@
namespace ACP3\Modules\ACP3\Share\Controller\Frontend\Index;
use ACP3\Core\Controller\AbstractFrontendAction;
use ACP3\Core\Controller\Context\FrontendContext;
use ACP3\Modules\ACP3\Comments\Controller\Frontend\Index\AbstractFrontendAction;
use ACP3\Modules\ACP3\Share\Model\Repository\ShareRatingsRepository;
use ACP3\Modules\ACP3\Share\Model\Repository\ShareRepository;
use ACP3\Modules\ACP3\Share\Model\ShareRatingModel;
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-users": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-users": "^4.25.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1"
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2"
},
"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.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"ckeditor/ckeditor": "dev-full/4.8.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1",
"acp3/setup": "^4.25.1",
"acp3/module-errors": "^4.25.1",
"acp3/module-permissions": "^4.25.1",
"acp3/module-system": "^4.25.1",
"acp3/module-users": "^4.25.1",
"acp3/core": "^4.25.2",
"acp3/setup": "^4.25.2",
"acp3/module-errors": "^4.25.2",
"acp3/module-permissions": "^4.25.2",
"acp3/module-system": "^4.25.2",
"acp3/module-users": "^4.25.2",
"tinymce/tinymce": "^4.4"
},
"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.25.2] - 2018-03-16
### Fixed
- the `rate` controller action of the social sharing module inherited from the wrong `AbstractFrontendAction`
## [4.25.1] - 2018-03-16
### Fixed
- fixed a bug when initially saving the to be activated social services
......@@ -571,7 +575,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.25.1...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.25.2...HEAD
[4.25.2]: https://gitlab.com/ACP3/cms/compare/v4.25.1...v4.25.2
[4.25.1]: https://gitlab.com/ACP3/cms/compare/v4.25.0...v4.25.1
[4.25.0]: https://gitlab.com/ACP3/cms/compare/v4.24.0...v4.25.0
[4.24.0]: https://gitlab.com/ACP3/cms/compare/v4.23.0...v4.24.0
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.25.1"
"acp3/core": "^4.25.2"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.25.1",
"version": "4.25.2",
"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