Commit 9b703ba2 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.20.0'

parents 09950317 53dc3bd2
......@@ -38,12 +38,12 @@ deploy:
on:
tags: true
condition: "$TRAVIS_PHP_VERSION = 7.1*"
- provider: script
script: ./build/travis/update_module_repositories.sh ${TRAVIS_TAG}
skip_cleanup: true
on:
tags: true
condition: "$TRAVIS_PHP_VERSION = 7.1*"
# - provider: script
# script: ./build/travis/update_module_repositories.sh ${TRAVIS_TAG}
# skip_cleanup: true
# on:
# tags: true
# condition: "$TRAVIS_PHP_VERSION = 7.1*"
- provider: script
script: ./build/travis/update_version_check.sh ${TRAVIS_TAG}
skip_cleanup: true
......
......@@ -13,6 +13,7 @@ use FOS\HttpCache\SymfonyCache\CacheInvalidation;
use FOS\HttpCache\SymfonyCache\DebugListener;
use FOS\HttpCache\SymfonyCache\EventDispatchingHttpCache;
use FOS\HttpCache\SymfonyCache\PurgeListener;
use FOS\HttpCache\SymfonyCache\PurgeTagsListener;
use FOS\HttpCache\SymfonyCache\RefreshListener;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\HttpCache\HttpCache;
......
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.19.1';
const VERSION = '4.20.0';
/**
* Performs some startup checks
......
......@@ -42,12 +42,8 @@ abstract class AbstractSessionHandler implements SessionHandlerInterface
ini_set('session.gc_probability', $this->gcProbability);
ini_set('session.gc_divisor', $this->gcDivisor);
// Set our own session handling methods
ini_set('session.save_handler', 'user');
session_set_save_handler($this, true);
session_register_shutdown();
// Start the session and secure it
$this->startSession();
}
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/module-categories": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"acp3/module-categories": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/module-categories": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"acp3/module-categories": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-users": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-users": "^4.20.0"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1"
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.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.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"ckeditor/ckeditor": "dev-full/4.7.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1",
"acp3/setup": "^4.19.1",
"acp3/module-errors": "^4.19.1",
"acp3/module-permissions": "^4.19.1",
"acp3/module-system": "^4.19.1",
"acp3/module-users": "^4.19.1",
"acp3/core": "^4.20.0",
"acp3/setup": "^4.20.0",
"acp3/module-errors": "^4.20.0",
"acp3/module-permissions": "^4.20.0",
"acp3/module-system": "^4.20.0",
"acp3/module-users": "^4.20.0",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,12 @@ 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.20.0] - 2017-12-21
### Changed
- Updated the friendsofsymfony/http-cache package to version 2.1.0
- Updated the symfony components to version 3.4.2
- Updated moment.js to version 2.20.1
## [4.19.1] - 2017-12-16
### Added
- Added a template file for the logout page
......@@ -487,7 +493,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://github.com/ACP3/cms/compare/v4.19.1...HEAD
[Unreleased]: https://github.com/ACP3/cms/compare/v4.20.0...HEAD
[4.20.0]: https://github.com/ACP3/cms/compare/v4.19.1...v4.20.0
[4.19.1]: https://github.com/ACP3/cms/compare/v4.19.0...v4.19.1
[4.19.0]: https://github.com/ACP3/cms/compare/v4.18.0...v4.19.0
[4.18.0]: https://github.com/ACP3/cms/compare/v4.17.0...v4.18.0
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#nav-user-login-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="sr-only">{lang t="system|toggle_navigation"}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......
......@@ -2,7 +2,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#nav-user-menu-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="sr-only">{lang t="system|toggle_navigation"}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......
......@@ -27,9 +27,9 @@ HTML;
exit;
}
$cacheStore = new \Symfony\Component\HttpKernel\HttpCache\Store(
$kernel->getAppPath()->getCacheDir() . 'http/'
);
$cacheStore = new \Toflar\Psr6HttpCacheStore\Psr6Store([
'cache_directory' => $kernel->getAppPath()->getCacheDir() . 'http/'
]);
$appCache = new \ACP3\Core\Application\BootstrapCache(
$kernel,
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.19.1"
"acp3/core": "^4.20.0"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.18.0",
"version": "4.19.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -508,7 +508,7 @@
"requires": {
"bootstrap": "3.3.7",
"jquery": "2.2.4",
"moment": "2.19.4",
"moment": "2.20.1",
"moment-timezone": "0.4.1"
}
},
......@@ -1836,9 +1836,9 @@
}
},
"moment": {
"version": "2.19.4",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.4.tgz",
"integrity": "sha512-1xFTAknSLfc47DIxHDUbnJWC+UwgWxATmymaxIPQpmMh7LBm7ZbwVEsuushqwL2GYZU0jie4xO+TK44hJPjNSQ==",
"version": "2.20.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
"integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==",
"dev": true
},
"moment-timezone": {
......@@ -1847,7 +1847,7 @@
"integrity": "sha1-gfWYw61eIs2teWtn7NjYjQ9bqgY=",
"dev": true,
"requires": {
"moment": "2.19.4"
"moment": "2.20.1"
}
},
"multipipe": {
......
{
"name": "acp3-cms",
"version": "4.19.1",
"version": "4.20.0",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......@@ -33,7 +33,7 @@
"html5shiv": "^3.7.3",
"jquery": "^2.2.4",
"js-cookie": "^2.2.0",
"moment": "^2.19.4",
"moment": "^2.20.1",
"yargs": "^10.0.3"
}
}
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