Commit 1962b984 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.1.28'

parents 66afa674 c73222c3
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.1.27';
const VERSION = '4.1.28';
/**
* Performs some startup checks
......
......@@ -139,6 +139,7 @@ class FileResolver
$this->designAssetsPath = $this->appPath->getDesignRootPathInternal() . $designInfo['parent'] . '/';
$assetPath = $this->getStaticAssetPath($modulePath, $designPath, $dir, $file);
$this->designAssetsPath = $this->appPath->getDesignPathInternal();
return $assetPath;
}
// No overrides have been found -> iterate over all possible module namespaces
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27",
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,14 +17,14 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27",
"acp3/module-categories": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28",
"acp3/module-categories": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,14 +17,14 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27",
"acp3/module-categories": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28",
"acp3/module-categories": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -18,12 +18,12 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-users": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-users": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-seo": "^4.1.27",
"acp3/module-system": "^4.1.27"
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-seo": "^4.1.28",
"acp3/module-system": "^4.1.28"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27",
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28",
"ckeditor/ckeditor": "dev-full/4.5.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27",
"acp3/setup": "^4.1.27",
"acp3/module-errors": "^4.1.27",
"acp3/module-permissions": "^4.1.27",
"acp3/module-system": "^4.1.27",
"acp3/module-users": "^4.1.27",
"acp3/core": "^4.1.28",
"acp3/setup": "^4.1.28",
"acp3/module-errors": "^4.1.28",
"acp3/module-permissions": "^4.1.28",
"acp3/module-system": "^4.1.28",
"acp3/module-users": "^4.1.28",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -7,12 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] - 2016-xx-xx
### Added
### Changed
### Fixed
## [4.1.28] - 2016-10-05
### Changed
- Reworked the version update check
### Fixed
- Fixed the theme inheritance
## [4.1.27] - 2016-10.03
## [4.1.27] - 2016-10-03
### Changed
- Reworked the version update check
......
This diff is collapsed.
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.1.27"
"acp3/core": "^4.1.28"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.1.27",
"version": "4.1.28",
"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