Skip to content

GitLab

Commit 7f107f8b authored by Susanne Moog's avatar Susanne Moog
Browse files

Merge branch 'develop' into feature/online-certification-registration

parents 5e21a337 99a85db3
Pipeline #5811 passed with stages
in 5 minutes and 34 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 28 deletions
.gitignore
View file @ 7f107f8b
......@@ -6,6 +6,7 @@ html/typo3
html/fileadmin/
html/typo3conf/ext/*
!html/typo3conf/ext/t3org_layout/
!html/typo3conf/ext/t3o_donation/
html/typo3conf/AdditionalConfiguration.php
html/typo3conf/deprecation_*
html/typo3conf/ENABLE_INSTALL_TOOL
......@@ -18,4 +19,4 @@ html/services/api-keys.php
/assets/
sequelpro.spf
.ddev/db_snapshots/
.idea/
\ No newline at end of file
.idea/
composer.lock
View file @ 7f107f8b
......@@ -1242,32 +1242,33 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.4.2",
"version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
"reference": "9f83dded91781a01c63574e387eaa769be769115"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
"reference": "9f83dded91781a01c63574e387eaa769be769115",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"psr/http-message": "~1.0"
"psr/http-message": "~1.0",
"ralouphie/getallheaders": "^2.0.5"
},
"provide": {
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
"dev-master": "1.5-dev"
}
},
"autoload": {
......@@ -1297,13 +1298,14 @@
"keywords": [
"http",
"message",
"psr-7",
"request",
"response",
"stream",
"uri",
"url"
],
"time": "2017-03-20T17:10:46+00:00"
"time": "2018-12-04T20:46:45+00:00"
},
{
"name": "helhum/config-loader",
......@@ -1844,6 +1846,46 @@
],
"time": "2016-10-10T12:19:37+00:00"
},
{
"name": "ralouphie/getallheaders",
"version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/ralouphie/getallheaders.git",
"reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
"reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"require-dev": {
"phpunit/phpunit": "~3.7.0",
"satooshi/php-coveralls": ">=1.0"
},
"type": "library",
"autoload": {
"files": [
"src/getallheaders.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ralph Khattar",
"email": "ralph.khattar@gmail.com"
}
],
"description": "A polyfill for getallheaders.",
"time": "2016-02-11T07:05:27+00:00"
},
{
"name": "reelworx/rx-shariff",
"version": "10.3.3",
......@@ -1943,7 +1985,7 @@
},
{
"name": "symfony/console",
"version": "v3.4.19",
"version": "v3.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
......@@ -2012,16 +2054,16 @@
},
{
"name": "symfony/debug",
"version": "v3.4.19",
"version": "v3.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "2016b3eec2e49c127dd02d0ef44a35c53181560d"
"reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/2016b3eec2e49c127dd02d0ef44a35c53181560d",
"reference": "2016b3eec2e49c127dd02d0ef44a35c53181560d",
"url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3",
"reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3",
"shasum": ""
},
"require": {
......@@ -2064,7 +2106,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-11-11T19:48:54+00:00"
"time": "2018-11-27T12:43:10+00:00"
},
{
"name": "symfony/dependency-injection",
......@@ -2139,7 +2181,7 @@
},
{
"name": "symfony/finder",
"version": "v3.4.19",
"version": "v3.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
......@@ -2354,7 +2396,7 @@
},
{
"name": "symfony/yaml",
"version": "v3.4.19",
"version": "v3.4.20",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
......@@ -2735,16 +2777,16 @@
},
{
"name": "typo3/cms",
"version": "v8.7.20",
"version": "v8.7.22",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/TYPO3.CMS.git",
"reference": "0912c2e6f6310761d2ff9ec202efb19fd9be563d"
"reference": "8ad01b6ece274eb1a11049e1120663af5895103f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/0912c2e6f6310761d2ff9ec202efb19fd9be563d",
"reference": "0912c2e6f6310761d2ff9ec202efb19fd9be563d",
"url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/8ad01b6ece274eb1a11049e1120663af5895103f",
"reference": "8ad01b6ece274eb1a11049e1120663af5895103f",
"shasum": ""
},
"require": {
......@@ -2944,7 +2986,7 @@
"extbase",
"typo3"
],
"time": "2018-10-30T10:39:51+00:00"
"time": "2018-12-14T07:43:50+00:00"
},
{
"name": "typo3/cms-cli",
......@@ -2982,21 +3024,21 @@
},
{
"name": "typo3/cms-composer-installers",
"version": "v1.5.2",
"version": "v1.5.3",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git",
"reference": "a5c340cafe69629869f046f4e2790fb87bfb9ded"
"reference": "aad8b6b56b45e2f9fc4542e1e64677da4ee8c5fa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/a5c340cafe69629869f046f4e2790fb87bfb9ded",
"reference": "a5c340cafe69629869f046f4e2790fb87bfb9ded",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/aad8b6b56b45e2f9fc4542e1e64677da4ee8c5fa",
"reference": "aad8b6b56b45e2f9fc4542e1e64677da4ee8c5fa",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0",
"php": ">=7.0.0 <7.3"
"php": ">=7.0.0 <7.4"
},
"conflict": {
"composer/installers": "<1.0.24 || >1.0.24"
......@@ -3047,7 +3089,7 @@
"installer",
"typo3"
],
"time": "2018-04-09T08:16:52+00:00"
"time": "2018-12-15T22:14:50+00:00"
},
{
"name": "typo3/phar-stream-wrapper",
......
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