Commit 2b24ea61 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.7.1'

parents 424dce07 c1a1390b
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.7.0';
const VERSION = '4.7.1';
/**
* Performs some startup checks
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/module-categories": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"acp3/module-categories": "^4.7.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/module-categories": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"acp3/module-categories": "^4.7.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -208,7 +208,7 @@
* Scroll to the beginning of the content area, if the current viewport is near the bottom
*/
scrollIntoView: function () {
var offsetTop = $(self.settings.targetElement).offset().top;
var offsetTop = $(this.settings.targetElement).offset().top;
if ($(document).scrollTop() > offsetTop) {
$('html, body').animate(
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-users": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-users": "^4.7.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0"
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0",
"acp3/setup": "^4.7.0",
"acp3/module-errors": "^4.7.0",
"acp3/module-permissions": "^4.7.0",
"acp3/module-system": "^4.7.0",
"acp3/module-users": "^4.7.0",
"acp3/core": "^4.7.1",
"acp3/setup": "^4.7.1",
"acp3/module-errors": "^4.7.1",
"acp3/module-permissions": "^4.7.1",
"acp3/module-system": "^4.7.1",
"acp3/module-users": "^4.7.1",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,10 @@ 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.7.1] - 2017-02-27
### Fixed
- fixed the AJAX forms
## [4.7.0] - 2017-02-27
### Added
- added the cookie consent to the system configuration
......@@ -271,7 +275,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.7.0...HEAD
[Unreleased]: https://github.com/ACP3/cms/compare/v4.7.1...HEAD
[4.7.1]: https://github.com/ACP3/cms/compare/v4.7.0...v4.7.1
[4.7.0]: https://github.com/ACP3/cms/compare/v4.6.2...v4.7.0
[4.6.2]: https://github.com/ACP3/cms/compare/v4.6.1...v4.6.2
[4.6.1]: https://github.com/ACP3/cms/compare/v4.6.0...v4.6.1
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.7.0"
"acp3/core": "^4.7.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.7.0",
"version": "4.7.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