Commit f2bfbcac authored by Tino Goratsch's avatar Tino Goratsch

Merge tag 'v4.25.0' into develop

v4.25.0
parents c8315869 c7c55ec0
Pipeline #19035368 canceled with stages
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.24.0';
const VERSION = '4.25.0';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"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.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"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.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/module-categories": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"acp3/module-categories": "^4.25.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"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.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/module-categories": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"acp3/module-categories": "^4.25.0"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"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.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-users": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-users": "^4.25.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0"
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0"
},
"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.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"ckeditor/ckeditor": "dev-full/4.8.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0",
"acp3/setup": "^4.24.0",
"acp3/module-errors": "^4.24.0",
"acp3/module-permissions": "^4.24.0",
"acp3/module-system": "^4.24.0",
"acp3/module-users": "^4.24.0",
"acp3/core": "^4.25.0",
"acp3/setup": "^4.25.0",
"acp3/module-errors": "^4.25.0",
"acp3/module-permissions": "^4.25.0",
"acp3/module-system": "^4.25.0",
"acp3/module-users": "^4.25.0",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,7 +4,7 @@ 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/).
## [Unreleased] - 2018-xx-yy
## [4.25.0] - 2018-03-16
### Added
- added a new module: Social sharing using the shariff library
- added font-awesome as new asset library (it is disabled by default)
......@@ -567,8 +567,9 @@ 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.24.0...HEAD
[4.24.0]: https://gitlab.com/ACP3/cms/compare/v4.23...v4.24.0
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.25.0...HEAD
[4.25.0]: https://gitlab.com/ACP3/cms/compare/v4.24.0...v4.25.0
[4.24.0]: https://gitlab.com/ACP3/cms/compare/v4.23.0...v4.24.0
[4.23.0]: https://gitlab.com/ACP3/cms/compare/v4.22.1...v4.23.0
[4.22.1]: https://gitlab.com/ACP3/cms/compare/v4.22.0...v4.22.1
[4.22.0]: https://gitlab.com/ACP3/cms/compare/v4.21.2...v4.22.0
......
......@@ -4,6 +4,7 @@
*/
const argv = require('yargs').argv;
const moment = require('moment');
module.exports = (gulp, plugins) => {
"use strict";
......@@ -52,6 +53,21 @@ module.exports = (gulp, plugins) => {
const from = getCurrentVersion();
const bumpedVersion = bumpVersion(from);
gulp.src(
[
'./CHANGELOG.md',
]
).pipe(plugins.change((content) => {
const currentDate = moment().format('YYYY-MM-DD');
return content
.replace('## [Unreleased]', `## [${bumpedVersion}] - ${currentDate}`)
.replace(
`[Unreleased]: https://gitlab.com/ACP3/cms/compare/v${from}...HEAD`,
`[Unreleased]: https://gitlab.com/ACP3/cms/compare/v${bumpedVersion}...HEAD\n` +
`[${bumpedVersion}]: https://gitlab.com/ACP3/cms/compare/v${from}...v${bumpedVersion}`
);
})).pipe(gulp.dest('./'));
return gulp.src(
[
'./ACP3/Core/composer.json',
......
......@@ -7,7 +7,7 @@ module.exports = function (gulp) {
'use strict';
return function () {
var nodeBasePath = './node_modules',
const nodeBasePath = './node_modules',
systemBasePath = './ACP3/Modules/ACP3/System/Resources/Assets',
ckeditorBasePath = './ACP3/Modules/ACP3/Wysiwygckeditor/Resources/Assets',
shareBasePath = './ACP3/Modules/ACP3/Share/Resources/Assets',
......@@ -59,9 +59,9 @@ module.exports = function (gulp) {
}
];
for (var i = 0; i < paths.length; i++) {
gulp.src(paths[i].src)
.pipe(gulp.dest(paths[i].dest));
for (const path of paths) {
gulp.src(path.src)
.pipe(gulp.dest(path.dest));
}
return 0;
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.24.0"
"acp3/core": "^4.25.0"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.24.0",
"version": "4.25.0",
"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