Commit 788f5961 authored by Tino Goratsch's avatar Tino Goratsch

Merge tag 'v4.12.2' into develop

Tagging version v4.12.2

# Conflicts:
#	ACP3/Modules/ACP3/Acp/composer.json
#	ACP3/Modules/ACP3/Articles/composer.json
#	ACP3/Modules/ACP3/Captcha/composer.json
#	ACP3/Modules/ACP3/Categories/composer.json
#	ACP3/Modules/ACP3/Comments/composer.json
#	ACP3/Modules/ACP3/Contact/composer.json
#	ACP3/Modules/ACP3/Emoticons/composer.json
#	ACP3/Modules/ACP3/Errors/composer.json
#	ACP3/Modules/ACP3/Feeds/composer.json
#	ACP3/Modules/ACP3/Filemanager/composer.json
#	ACP3/Modules/ACP3/Files/composer.json
#	ACP3/Modules/ACP3/Gallery/composer.json
#	ACP3/Modules/ACP3/Guestbook/composer.json
#	ACP3/Modules/ACP3/Menus/composer.json
#	ACP3/Modules/ACP3/News/composer.json
#	ACP3/Modules/ACP3/Newsletter/composer.json
#	ACP3/Modules/ACP3/Permissions/composer.json
#	ACP3/Modules/ACP3/Polls/composer.json
#	ACP3/Modules/ACP3/Search/composer.json
#	ACP3/Modules/ACP3/Seo/composer.json
#	ACP3/Modules/ACP3/System/composer.json
#	ACP3/Modules/ACP3/Users/composer.json
#	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
#	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
#	installation/composer.json
parent f6e2bb7f
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"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",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"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.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"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.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"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",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/module-categories": "^4.12.1"
"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"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"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.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"acp3/module-categories": "^4.12.1"
"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"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"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.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"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",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-users": "^4.12.1"
"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"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1"
"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"
},
"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.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"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",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1",
"acp3/setup": "^4.12.1",
"acp3/module-errors": "^4.12.1",
"acp3/module-permissions": "^4.12.1",
"acp3/module-system": "^4.12.1",
"acp3/module-users": "^4.12.1",
"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",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.12.1"
"acp3/core": "^4.12.2"
},
"extra": {
"installer-name": "installation"
......
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