Commit 0b4e7d70 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.13.0'

parents be073861 b91f59e7
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.12.2';
const VERSION = '4.13.0';
/**
* Performs some startup checks
......
......@@ -15,7 +15,7 @@
},
"require": {
"php": ">=5.6.0",
"acp3/composer-installer": "*",
"acp3/composer-installer": "^1.0",
"doctrine/dbal": "^2.5",
"doctrine/cache": "^1.6",
"fisharebest/localization": "^1.10",
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,12 +16,12 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,14 +16,14 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/module-categories": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"acp3/module-categories": "^4.13.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,14 +16,14 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/module-categories": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"acp3/module-categories": "^4.13.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -16,12 +16,12 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-users": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-users": "^4.13.0"
},
"autoload": {
"psr-4": {
......
......@@ -16,12 +16,12 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -16,13 +16,13 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2",
"acp3/setup": "^4.12.2",
"acp3/module-errors": "^4.12.2",
"acp3/module-permissions": "^4.12.2",
"acp3/module-system": "^4.12.2",
"acp3/module-users": "^4.12.2",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0",
"acp3/setup": "^4.13.0",
"acp3/module-errors": "^4.13.0",
"acp3/module-permissions": "^4.13.0",
"acp3/module-system": "^4.13.0",
"acp3/module-users": "^4.13.0",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,13 @@ 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.13.0] - 2017-09-01
### Added
- Added some CLI scripts to the composer.json
### Changed
- Adjusted the modules composer.json files so that the version constraint for the `acp3/composer-installer` package is `^1.0` and not `*`
## [4.12.2] - 2017-08-16
### Fixed
- Correctly escape the special HTML characters, so that the Email sending isn't breaking
......@@ -388,7 +395,10 @@ 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://github.com/ACP3/cms/compare/v4.12.0...HEAD
[Unreleased]: https://github.com/ACP3/cms/compare/v4.13.0...HEAD
[4.13.0]: https://github.com/ACP3/cms/compare/v4.12.2...v4.13.0
[4.12.2]: https://github.com/ACP3/cms/compare/v4.12.1...v4.12.2
[4.12.1]: https://github.com/ACP3/cms/compare/v4.12.0...v4.12.1
[4.12.0]: https://github.com/ACP3/cms/compare/v4.11.1...v4.12.0
[4.11.1]: https://github.com/ACP3/cms/compare/v4.11.0...v4.11.1
[4.11.0]: https://github.com/ACP3/cms/compare/v4.10.1...v4.11.0
......
......@@ -81,5 +81,12 @@
"acp3/module-users": "self.version",
"acp3/module-wysiwyg-ckeditor": "self.version",
"acp3/module-wysiwyg-tinymce": "self.version"
},
"scripts": {
"test": "./vendor/bin/phpunit -c ./tests/phpunit.dist.xml",
"test-windows": ".\\vendor\\bin\\phpunit.bat -c .\\tests\\phpunit.dist.xml",
"test-with-coverage": "phpdbg -qrr ./vendor/bin/phpunit -c ./tests/phpunit.dist.xml --coverage-clover ./build/logs/clover.xml",
"lint": "./vendor/bin/php-cs-fixer fix",
"lint-windows": ".\\vendor\\bin\\php-cs-fixer.bat fix"
}
}
# Auto detect text files and perform LF normalization
* text=auto
/Test export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
This diff is collapsed.
# ACP3/theme-default
Repository of the default theme of the ACP3 CMS.
## Attention
Please do not make pull requests to this repository, as it is just a read only repository.
Please make pull requests to the [ACP3/cms](https://github.com/ACP3/cms.git) repository.
{
"name": "acp3/theme-default",
"description": "This is the default design of the ACP3 CMS.",
"type": "acp3-theme",
"license": "GPL-2.0+",
"authors": [
{
"name": "Tino Goratsch",
"email": "mail@acp3-cms.net"
}
],
"support": {
"email": "mail@acp3-cms.net",
"issues": "https://github.com/ACP3/cms/issues"
},
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.0"
},
"extra": {
"installer-name": "acp3"
}
}
......@@ -19,8 +19,8 @@
}
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.12.2"
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.13.0"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.12.2",
"version": "4.13.0",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......
......@@ -15,7 +15,7 @@
},
"require": {
"php": ">=5.6.0",
"acp3/composer-installer": "*",
"acp3/composer-installer": "^1.0",
"phpunit/phpunit": "^5.5"
},
"extra": {
......
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