Commit f7d846c4 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.21.2'

parents 423a3d63 0e78300f
Pipeline #16398445 passed with stages
in 15 minutes and 44 seconds
......@@ -126,14 +126,14 @@ post-deploy:notify-packagist: &post-deploy-base
# only:
# - tags
post-deploy:apidocs:
<<: *post-deploy-base
before_script:
- bash ./build/gitlab/before_script.sh > /dev/null
- bash ./build/gitlab/before_script_php.sh > /dev/null
- git config --global user.email "mail@acp3-cms.net"
- git config --global user.name "Tino Goratsch"
script:
- bash ./build/gitlab/generate_api_docs.sh
only:
- tags
#post-deploy:apidocs:
# <<: *post-deploy-base
# before_script:
# - bash ./build/gitlab/before_script.sh > /dev/null
# - bash ./build/gitlab/before_script_php.sh > /dev/null
# - git config --global user.email "mail@acp3-cms.net"
# - git config --global user.name "Tino Goratsch"
# script:
# - bash ./build/gitlab/generate_api_docs.sh
# only:
# - tags
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.21.1';
const VERSION = '4.21.2';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
{extends file="asset:`$LAYOUT`"}
{extends file="asset:layout.tpl"}
{block CONTENT}
{include file="asset:System/Partials/no_results.tpl" no_results_text={lang t="errors|access_denied"}}
......
{extends file="asset:`$LAYOUT`"}
{extends file="asset:layout.tpl"}
{block CONTENT}
{include file="asset:System/Partials/no_results.tpl" no_results_text={lang t="errors|file_not_found"}}
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/module-categories": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"acp3/module-categories": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/module-categories": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"acp3/module-categories": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-users": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-users": "^4.21.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1"
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.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.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.2",
"ckeditor/ckeditor": "dev-full/4.7.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1",
"acp3/setup": "^4.21.1",
"acp3/module-errors": "^4.21.1",
"acp3/module-permissions": "^4.21.1",
"acp3/module-system": "^4.21.1",
"acp3/module-users": "^4.21.1",
"acp3/core": "^4.21.2",
"acp3/setup": "^4.21.2",
"acp3/module-errors": "^4.21.2",
"acp3/module-permissions": "^4.21.2",
"acp3/module-system": "^4.21.2",
"acp3/module-users": "^4.21.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.21.2] - 2018-01-20
### Changed
- the access_forbidden and not_found actions of the errors module are now using the "normal" layout, to improve the UX in case of these errors
## [4.21.1] - 2018-01-20
### Fixed
- Added a missing composer dependency to the ACP3 core module
......@@ -509,7 +513,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.21.1...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.21.2...HEAD
[4.21.2]: https://gitlab.com/ACP3/cms/compare/v4.21.1...v4.21.2
[4.21.1]: https://gitlab.com/ACP3/cms/compare/v4.21.0...v4.21.1
[4.21.0]: https://gitlab.com/ACP3/cms/compare/v4.20.0...v4.21.0
[4.20.0]: https://gitlab.com/ACP3/cms/compare/v4.19.1...v4.20.0
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.21.1"
"acp3/core": "^4.21.2"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.21.1",
"version": "4.21.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