Commit a49ef622 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.26.1'

parents ed93f2ad f5180a1b
Pipeline #19148637 passed with stages
in 17 minutes and 42 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.26.0';
const VERSION = '4.26.1';
/**
* Performs some startup checks.
......
......@@ -71,6 +71,7 @@ class Libraries
'css' => [
'fa-brands.css',
'fa-regular.css',
'fa-solid.css',
'fontawesome.css',
],
],
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/module-categories": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"acp3/module-categories": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/module-categories": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"acp3/module-categories": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"heise/shariff": "^7.1"
},
"autoload": {
......
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-users": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-users": "^4.26.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0"
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.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.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"ckeditor/ckeditor": "dev-full/4.8.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0",
"acp3/setup": "^4.26.0",
"acp3/module-errors": "^4.26.0",
"acp3/module-permissions": "^4.26.0",
"acp3/module-system": "^4.26.0",
"acp3/module-users": "^4.26.0",
"acp3/core": "^4.26.1",
"acp3/setup": "^4.26.1",
"acp3/module-errors": "^4.26.1",
"acp3/module-permissions": "^4.26.1",
"acp3/module-system": "^4.26.1",
"acp3/module-users": "^4.26.1",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,9 +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.26.1] - 2018-03-19
### Added
- added the solid icons of fontawesome 5
## [4.26.0] - 2018-03-19
### Changed
- updated fontawesome to version 5.0
- updated fontawesome to version 5
- updated shariff to version 3.0.0
- when generating a route with the path of homepage, it simple will return `/`
......@@ -605,7 +609,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.26.0...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.26.1...HEAD
[4.26.1]: https://gitlab.com/ACP3/cms/compare/v4.26.0...v4.26.1
[4.26.0]: https://gitlab.com/ACP3/cms/compare/v4.25.7...v4.26.0
[4.25.7]: https://gitlab.com/ACP3/cms/compare/v4.25.6...v4.25.7
[4.25.6]: https://gitlab.com/ACP3/cms/compare/v4.25.5...v4.25.6
......
......@@ -58,6 +58,7 @@ module.exports = function (gulp) {
nodeBasePath + '/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
nodeBasePath + '/@fortawesome/fontawesome-free-webfonts/css/fa-brands.css',
nodeBasePath + '/@fortawesome/fontawesome-free-webfonts/css/fa-regular.css',
nodeBasePath + '/@fortawesome/fontawesome-free-webfonts/css/fa-solid.css',
nodeBasePath + '/@fortawesome/fontawesome-free-webfonts/css/fontawesome.css',
nodeBasePath + '/datatables.net-bs/css/dataTables.bootstrap.css'
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.0"
"acp3/core": "^4.26.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.26.0",
"version": "4.26.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