Commit 2792ec5e authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.10.1'

parents 1f959a16 c673d8e0
......@@ -30,7 +30,6 @@ script:
after_success:
- travis_retry vendor/bin/coveralls -v
# - ./build/travis/push_code_coverage.sh ${TRAVIS_PHP_VERSION}
before_deploy:
- ./build/travis/generate_artifact.sh ${TRAVIS_PHP_VERSION}
......@@ -42,19 +41,19 @@ deploy:
skip_cleanup: true
on:
tags: true
condition: "$TRAVIS_PHP_VERSION = '7.0'"
condition: "$TRAVIS_PHP_VERSION = 7.0*"
- provider: script
script: ./build/travis/update_module_repositories.sh ${TRAVIS_TAG}
skip_cleanup: true
on:
tags: true
condition: "$TRAVIS_PHP_VERSION = '7.0'"
condition: "$TRAVIS_PHP_VERSION = 7.0*"
- provider: script
script: ./build/travis/update_version_check.sh ${TRAVIS_TAG}
skip_cleanup: true
on:
tags: true
condition: "$TRAVIS_PHP_VERSION = '7.0'"
condition: "$TRAVIS_PHP_VERSION = 7.0*"
cache:
directories:
......
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.10.0';
const VERSION = '4.10.1';
/**
* Performs some startup checks
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"google/recaptcha": "^1.1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.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.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.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.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/module-categories": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"acp3/module-categories": "^4.10.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.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.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/module-categories": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"acp3/module-categories": "^4.10.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.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.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-users": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-users": "^4.10.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0"
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.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.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"ckeditor/ckeditor": "dev-full/4.6.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0",
"acp3/setup": "^4.10.0",
"acp3/module-errors": "^4.10.0",
"acp3/module-permissions": "^4.10.0",
"acp3/module-system": "^4.10.0",
"acp3/module-users": "^4.10.0",
"acp3/core": "^4.10.1",
"acp3/setup": "^4.10.1",
"acp3/module-errors": "^4.10.1",
"acp3/module-permissions": "^4.10.1",
"acp3/module-system": "^4.10.1",
"acp3/module-users": "^4.10.1",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -3,7 +3,7 @@
ACP3_CI_USER_GH_TOKEN=$1;
TRAVIS_PHP_VERSION=$2;
if [[ ${TRAVIS_PHP_VERSION} = "7.0" || ${TRAVIS_PHP_VERSION} = "7.1" ]]
if [[ ${TRAVIS_PHP_VERSION} = 7* ]]
then
phpenv config-rm xdebug.ini
fi
......
......@@ -2,7 +2,7 @@
TRAVIS_PHP_VERSION=$1
if [[ ${TRAVIS_PHP_VERSION} = "7.0" ]]
if [[ ${TRAVIS_PHP_VERSION} = 7.0* ]]
then
if [ ! -f release.zip ]
then
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.10.0"
"acp3/core": "^4.10.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.10.0",
"version": "4.10.1",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......@@ -35,6 +35,6 @@
"jquery": "^2.2.4",
"js-cookie": "^2.1.3",
"moment": "^2.15.0",
"yargs": "^4.10.0"
"yargs": "^4.10.1"
}
}
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