Commit 6641f32a authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.29.1'

parents 1f9ae779 3c04556e
Pipeline #29400925 passed with stages
in 7 minutes and 15 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.29.0';
const VERSION = '4.29.1';
/**
* Performs some startup checks.
......
......@@ -165,7 +165,7 @@ class Theme implements ThemePathInterface
public function getDesignPathWeb(): string
{
if ($this->designPathWeb === null) {
$this->designPathWeb = $this->appPath->getWebRoot() . $this->getCurrentTheme() . '/';
$this->designPathWeb = $this->appPath->getWebRoot() . 'designs/' . $this->getCurrentTheme() . '/';
}
return $this->designPathWeb;
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"google/recaptcha": "^1.2.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/module-categories": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"acp3/module-categories": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/module-categories": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"acp3/module-categories": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-users": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-users": "^4.29.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0"
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -177,6 +177,7 @@ class CKEditor extends Textarea
$js .= "CKEDITOR.plugins.addExternal('divarea', '" . $ckeditorPluginsDir . "divarea/');\n";
$js .= "CKEDITOR.plugins.addExternal('embedbase', '" . $ckeditorPluginsDir . "embedbase/');\n";
$js .= "CKEDITOR.plugins.addExternal('embed', '" . $ckeditorPluginsDir . "embed/');\n";
$js .= 'CKEDITOR.dtd.$removeEmpty[\'i\'] = false;' . "\n";
$config = $this->configure();
if (!empty($config)) {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"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.0",
"acp3/setup": "^4.29.0",
"acp3/module-errors": "^4.29.0",
"acp3/module-permissions": "^4.29.0",
"acp3/module-system": "^4.29.0",
"acp3/module-users": "^4.29.0",
"acp3/core": "^4.29.1",
"acp3/setup": "^4.29.1",
"acp3/module-errors": "^4.29.1",
"acp3/module-permissions": "^4.29.1",
"acp3/module-system": "^4.29.1",
"acp3/module-users": "^4.29.1",
"tinymce/tinymce": "^4.8"
},
"autoload": {
......
......@@ -4,6 +4,11 @@ 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.1] - 2018-09-04
### Fixed
- fixed the `ACP3\Core\Environment\Theme::getDesignPathWeb()` method so that it returns the correct path
- The CKEditor now preserves empty `<i>`-tags, as they are mostly used for icons
## [4.29.0] - 2018-09-03
### Added
- back ported the possibility to run CLI commands from ACP3.next
......@@ -669,7 +674,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.0...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.29.1...HEAD
[4.29.1]: https://gitlab.com/ACP3/cms/compare/v4.29.0...v4.29.1
[4.29.0]: https://gitlab.com/ACP3/cms/compare/v4.28.4...v4.29.0
[4.28.4]: https://gitlab.com/ACP3/cms/compare/v4.28.3...v4.28.4
[4.28.3]: https://gitlab.com/ACP3/cms/compare/v4.28.2...v4.28.3
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.29.0"
"acp3/core": "^4.29.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.29.0",
"version": "4.29.1",
"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