EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2020.05-04'

Browse Source
This commit is contained in:
Björn Fromme
2020-05-28 20:34:19 +02:00
parent fd273e7960 dbf03b28c4
commit bc8ffe5cab
15 changed files with 137 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+120 -64
View File
@@ -100,22 +100,22 @@
},
{
"name": "doctrine/annotations",
"version": "1.10.2",
"version": "1.10.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
"reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
"reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
"reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
"ext-tokenizer": "*",
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/cache": "1.*",
@@ -165,24 +165,24 @@
"docblock",
"parser"
],
"time": "2020-04-20T09:18:32+00:00"
"time": "2020-05-25T17:24:27+00:00"
},
{
"name": "doctrine/cache",
"version": "1.10.0",
"version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
"reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
"reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
"url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
"reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
"shasum": ""
},
"require": {
"php": "~7.1"
"php": "~7.1 || ^8.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
@@ -247,7 +247,21 @@
"redis",
"xcache"
],
"time": "2019-11-29T15:36:20+00:00"
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
"type": "tidelift"
}
],
"time": "2020-05-27T16:24:54+00:00"
},
{
"name": "doctrine/dbal",
@@ -491,20 +505,20 @@
},
{
"name": "doctrine/lexer",
"version": "1.2.0",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
"reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
"shasum": ""
},
"require": {
"php": "^7.2"
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
@@ -549,7 +563,21 @@
"parser",
"php"
],
"time": "2019-10-30T14:39:59+00:00"
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
"type": "custom"
},
{
"url": "https://www.patreon.com/phpdoctrine",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
"type": "tidelift"
}
],
"time": "2020-05-25T17:44:05+00:00"
},
{
"name": "fab/media",
@@ -853,16 +881,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.3",
"version": "6.5.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": ""
},
"require": {
@@ -870,7 +898,7 @@
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.11"
"symfony/polyfill-intl-idn": "1.17.0"
},
"require-dev": {
"ext-curl": "*",
@@ -916,7 +944,7 @@
"rest",
"web service"
],
"time": "2020-04-18T10:38:46+00:00"
"time": "2020-05-25T19:35:05+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1190,16 +1218,16 @@
},
{
"name": "helhum/typo3-console-plugin",
"version": "v2.0.6",
"version": "v2.0.7",
"source": {
"type": "git",
"url": "https://github.com/TYPO3-Console/typo3-console-plugin.git",
"reference": "a1294743007316e382c854b683c190277f5a1cd7"
"reference": "08132bd713f338c15009699dfa4bc236f9b5cee9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/a1294743007316e382c854b683c190277f5a1cd7",
"reference": "a1294743007316e382c854b683c190277f5a1cd7",
"url": "https://api.github.com/repos/TYPO3-Console/typo3-console-plugin/zipball/08132bd713f338c15009699dfa4bc236f9b5cee9",
"reference": "08132bd713f338c15009699dfa4bc236f9b5cee9",
"shasum": ""
},
"require": {
@@ -1208,8 +1236,7 @@
"typo3/cms-composer-installers": "^1.4 || ^2.0 || ^3.0@dev"
},
"require-dev": {
"composer/composer": "^1.0@dev || ^2.0@dev",
"composer/semver": "^1.0@dev || ^2.0@dev"
"composer/composer": "^1.10@dev || ^2.0@dev"
},
"type": "composer-plugin",
"extra": {
@@ -1240,7 +1267,7 @@
"plugin",
"typo3 console"
],
"time": "2020-03-29T17:41:09+00:00"
"time": "2020-05-28T13:44:02+00:00"
},
{
"name": "kigkonsult/icalcreator",
@@ -2040,23 +2067,24 @@
},
{
"name": "ssch/typo3-encore",
"version": "v2.0.9",
"version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/sabbelasichon/typo3_encore.git",
"reference": "9f2505e8adfeed6e3f5b3427d551b85290de1fa0"
"reference": "f05ef439c800fcafc9c2d4bf9cca50b49aa4523c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabbelasichon/typo3_encore/zipball/9f2505e8adfeed6e3f5b3427d551b85290de1fa0",
"reference": "9f2505e8adfeed6e3f5b3427d551b85290de1fa0",
"url": "https://api.github.com/repos/sabbelasichon/typo3_encore/zipball/f05ef439c800fcafc9c2d4bf9cca50b49aa4523c",
"reference": "f05ef439c800fcafc9c2d4bf9cca50b49aa4523c",
"shasum": ""
},
"require": {
"php": ">=7.2.0 <8.0",
"ext-dom": "*",
"php": ">=7.2.5 <8.0",
"symfony/asset": "^5.0",
"symfony/web-link": "^4.3",
"typo3/cms-core": "^9.5 || ^10.4"
"typo3/cms-core": "^9.5.17 || ^10.4.2"
},
"replace": {
"typo3-ter/typo3-encore": "self.version"
@@ -2070,7 +2098,7 @@
"type": "typo3-cms-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0.0-dev"
"dev-master": "2.x-dev"
},
"typo3/cms": {
"extension-key": "typo3_encore",
@@ -2101,7 +2129,7 @@
"encore",
"webpack"
],
"time": "2020-04-22T19:03:26+00:00"
"time": "2020-05-28T06:34:18+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -2322,20 +2350,20 @@
},
{
"name": "symfony/cache-contracts",
"version": "v2.0.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
"reference": "23ed8bfc1a4115feca942cb5f1aacdf3dcdf3c16"
"reference": "87c92f62c494626598e9148208aaa6d1716b8e3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache-contracts/zipball/23ed8bfc1a4115feca942cb5f1aacdf3dcdf3c16",
"reference": "23ed8bfc1a4115feca942cb5f1aacdf3dcdf3c16",
"url": "https://api.github.com/repos/symfony/cache-contracts/zipball/87c92f62c494626598e9148208aaa6d1716b8e3c",
"reference": "87c92f62c494626598e9148208aaa6d1716b8e3c",
"shasum": ""
},
"require": {
"php": "^7.2.5",
"php": ">=7.2.5",
"psr/cache": "^1.0"
},
"suggest": {
@@ -2344,7 +2372,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"autoload": {
@@ -2376,7 +2404,21 @@
"interoperability",
"standards"
],
"time": "2019-11-18T17:27:11+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-20T17:43:50+00:00"
},
{
"name": "symfony/console",
@@ -2680,20 +2722,20 @@
},
{
"name": "symfony/http-client-contracts",
"version": "v2.1.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
"reference": "e3ba2688594d8ef284f40348f7efb72cba4edec4"
"reference": "f8bed25edc964d015bcd87f1fec5734963931910"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/e3ba2688594d8ef284f40348f7efb72cba4edec4",
"reference": "e3ba2688594d8ef284f40348f7efb72cba4edec4",
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/f8bed25edc964d015bcd87f1fec5734963931910",
"reference": "f8bed25edc964d015bcd87f1fec5734963931910",
"shasum": ""
},
"require": {
"php": "^7.2.5"
"php": ">=7.2.5"
},
"suggest": {
"symfony/http-client-implementation": ""
@@ -2747,7 +2789,7 @@
"type": "tidelift"
}
],
"time": "2020-05-09T18:37:03+00:00"
"time": "2020-05-25T17:37:45+00:00"
},
{
"name": "symfony/http-foundation",
@@ -3889,20 +3931,20 @@
},
{
"name": "symfony/service-contracts",
"version": "v2.0.1",
"version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "144c5e51266b281231e947b51223ba14acf1a749"
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
"reference": "144c5e51266b281231e947b51223ba14acf1a749",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
"reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
"shasum": ""
},
"require": {
"php": "^7.2.5",
"php": ">=7.2.5",
"psr/container": "^1.0"
},
"suggest": {
@@ -3911,7 +3953,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
},
"autoload": {
@@ -3943,7 +3985,21 @@
"interoperability",
"standards"
],
"time": "2019-11-18T17:27:11+00:00"
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-05-20T17:43:50+00:00"
},
{
"name": "symfony/var-exporter",
@@ -4184,16 +4240,16 @@
},
{
"name": "typo3/class-alias-loader",
"version": "v1.1.2",
"version": "v1.1.3",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/class-alias-loader.git",
"reference": "ead04a4d7bc215ca1faa895977c5ea349f0b7383"
"reference": "575f59581541f299f3a86a95b1db001ee6e1d2e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/class-alias-loader/zipball/ead04a4d7bc215ca1faa895977c5ea349f0b7383",
"reference": "ead04a4d7bc215ca1faa895977c5ea349f0b7383",
"url": "https://api.github.com/repos/TYPO3/class-alias-loader/zipball/575f59581541f299f3a86a95b1db001ee6e1d2e0",
"reference": "575f59581541f299f3a86a95b1db001ee6e1d2e0",
"shasum": ""
},
"require": {
@@ -4238,7 +4294,7 @@
"classloader",
"composer"
],
"time": "2020-05-07T12:46:20+00:00"
"time": "2020-05-24T13:03:22+00:00"
},
{
"name": "typo3/cms-adminpanel",
config/sites/ep-events/config.yaml
+1 -4
View File
@@ -1,11 +1,8 @@
base: 'https://www.ep-events.de'
baseVariants:
-
base: 'https://ep-events.burn.dpn'
condition: 'applicationContext == "Development"'
-
base: 'https://ep-events.ddev.site'
condition: 'applicationContext == "Development/Ddev"'
condition: 'applicationContext == "Development"'
disableStaticFileCache: false
errorHandling:
-
config/sites/ski-boarderweek/config.yaml
+1 -4
View File
@@ -1,11 +1,8 @@
base: 'https://www.ski-boarderweek.de'
baseVariants:
-
base: 'https://ski-boarderweek.burn.dpn'
condition: 'applicationContext == "Development"'
-
base: 'https://ski-boarderweek.ddev.site'
condition: 'applicationContext == "Development/Ddev"'
condition: 'applicationContext == "Development"'
disableStaticFileCache: false
errorHandling:
-
config/sites/ski-wochenenden/config.yaml
+1 -4
View File
@@ -1,11 +1,8 @@
base: 'https://www.ski-wochenenden.de'
baseVariants:
-
base: 'https://ski-wochenenden.burn.dpn'
condition: 'applicationContext == "Development"'
-
base: 'https://ski-wochenenden.ddev.site'
condition: 'applicationContext == "Development/Ddev"'
condition: 'applicationContext == "Development"'
disableStaticFileCache: false
errorHandling:
-
config/sites/snowzone/config.yaml
+1 -4
View File
@@ -1,11 +1,8 @@
base: 'https://www.snowzone.net'
baseVariants:
-
base: 'https://snowzone.burn.dpn'
condition: 'applicationContext == "Development"'
-
base: 'https://snowzone.ddev.site'
condition: 'applicationContext == "Development/Ddev"'
condition: 'applicationContext == "Development"'
disableStaticFileCache: false
errorHandling:
-
config/sites/unichamp/config.yaml
+1 -4
View File
@@ -1,11 +1,8 @@
base: 'https://www.unichamp.de'
baseVariants:
-
base: 'https://unichamp.burn.dpn'
condition: 'applicationContext == "Development"'
-
base: 'https://unichamp.ddev.site'
condition: 'applicationContext == "Development/Ddev"'
condition: 'applicationContext == "Development"'
disableStaticFileCache: false
errorHandling:
-
public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php
+1 -1
View File
@@ -128,7 +128,7 @@ call_user_func(function() {
'allowedAspectRatios' => [
'header' => [
'title' => 'Header Startseite',
'value' => 2.0571,
'value' => 1440 / 700,
],
],
],
public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages_language_overlay.php
+1 -1
View File
@@ -111,7 +111,7 @@ call_user_func(function() {
'allowedAspectRatios' => [
'header' => [
'title' => 'Header Startseite',
'value' => 2.0571,
'value' => 1440 / 700,
],
],
],
public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/tt_content_element_herounit.php
+2 -2
View File
@@ -68,11 +68,11 @@ call_user_func(function() {
'allowedAspectRatios' => [
'headerDefault' => [
'title' => 'Header standard',
'value' => 2.63333333333333,
'value' => 1440 / 420,
],
'headerLarge' => [
'title' => 'Header groß',
'value' => 2.0571,
'value' => 1440 / 700,
],
],
],
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php
+3 -3
View File
@@ -285,7 +285,7 @@ return [
'allowedAspectRatios' => [
'teaser' => [
'title' => 'Teaser',
'value' => 1.7857,
'value' => 450 / 250,
],
],
],
@@ -325,7 +325,7 @@ return [
'allowedAspectRatios' => [
'teaser' => [
'title' => 'Teaser',
'value' => 1.7857,
'value' => 450 / 250,
],
],
],
@@ -365,7 +365,7 @@ return [
'allowedAspectRatios' => [
'teaser' => [
'title' => 'Header',
'value' => 2.63333333333333,
'value' => 1440 / 700,
],
],
],
public/typo3conf/ext/ep_events/Resources/Private/Partials/HerounitActivity.html
+1 -1
View File
@@ -4,7 +4,7 @@
<f:spaceless>
<f:if condition="{activity.imageHeader.uid}">
<f:then>
{f:uri.image(image: activity.imageHeader, cropVariant: 'default', width: '1440', maxHeight: '700') -> v:variable.set(name: 'headerImage')}
{f:uri.image(image: activity.imageHeader, width: '1440') -> v:variable.set(name: 'headerImage')}
</f:then>
<f:else>
{f:uri.image(src: settings.activityDefaultHeaderImage, width: '1440') -> v:variable.set(name: 'headerImage')}
public/typo3conf/ext/ep_events/Resources/Private/Partials/HerounitCategory.html
+1 -1
View File
@@ -3,7 +3,7 @@
<f:spaceless>
<f:if condition="{traveltype.imageHeader.uid}">
<f:then>
{f:uri.image(image: traveltype.imageHeader, cropVariant: 'default', width: '1440', maxHeight: '700') -> v:variable.set(name: 'headerImage')}
{f:uri.image(image: traveltype.imageHeader, width: '1440') -> v:variable.set(name: 'headerImage')}
</f:then>
<f:else>
{v:variable.set(name: 'headerImage', value: 'https://placehold.it/1440x700')}
public/typo3conf/ext/ep_events/Resources/Private/Partials/HerounitFrontpage.html
+1 -1
View File
@@ -34,7 +34,7 @@
style="background-image: url({f:uri.image(image: image, cropVariant: 'default', width: '1440', maxHeight: '700')})"></a>
</f:then>
<f:else>
<div class="herounit__image" style="background-image: url({f:uri.image(image: image, cropVariant: 'default', width: '1440', maxHeight: '700')})"></div>
<div class="herounit__image" style="background-image: url({f:uri.image(image: image, width: '1440')})"></div>
</f:else>
</f:if>
</f:for>
public/typo3conf/ext/ep_events/Resources/Private/Partials/HerounitOffer.html
+1 -1
View File
@@ -4,7 +4,7 @@
<f:spaceless>
<f:if condition="{offer.imageHeader.uid}">
<f:then>
{f:uri.image(image: offer.imageHeader, cropVariant: 'default', width: '1440', maxHeight: '700') -> v:variable.set(name: 'headerImage')}
{f:uri.image(image: offer.imageHeader, width: '1440') -> v:variable.set(name: 'headerImage')}
</f:then>
<f:else>
{v:variable.set(name: 'headerImage', value: 'https://placehold.it/1440x700')}
public/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Herounit.html
+1 -1
View File
@@ -10,7 +10,7 @@
<f:spaceless>
<f:if condition="{image.0.uid}">
<f:then>
{f:uri.image(image: image.0, cropVariant: 'default', width: '1440', maxHeight: '700') -> v:variable.set(name: 'headerImage')}
{f:uri.image(image: image.0, width: '1440') -> v:variable.set(name: 'headerImage')}
</f:then>
<f:else>
{v:variable.set(name: 'headerImage', value: 'https://placehold.it/1440x700')}