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

Merge branch 'release/2019.11-03'

Browse Source
This commit is contained in:
Björn Fromme
2019-11-19 14:50:45 +01:00
parent bfb5ab7666 5eda78bbf4
commit 716b441c84
2 changed files with 81 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+76 -68
View File
@@ -217,16 +217,16 @@
},
{
"name": "doctrine/cache",
"version": "1.8.2",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "cf73f063172f4ec18b6cbb293e30363e11e8d30a"
"reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/cf73f063172f4ec18b6cbb293e30363e11e8d30a",
"reference": "cf73f063172f4ec18b6cbb293e30363e11e8d30a",
"url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55",
"reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55",
"shasum": ""
},
"require": {
@@ -237,7 +237,7 @@
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
"doctrine/coding-standard": "^4.0",
"doctrine/coding-standard": "^6.0",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
@@ -248,7 +248,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.8.x-dev"
"dev-master": "1.9.x-dev"
}
},
"autoload": {
@@ -282,13 +282,21 @@
"email": "[email protected]"
}
],
"description": "Caching library offering an object-oriented API for many cache backends",
"homepage": "https://www.doctrine-project.org",
"description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
"homepage": "https://www.doctrine-project.org/projects/cache.html",
"keywords": [
"abstraction",
"apcu",
"cache",
"caching"
"caching",
"couchdb",
"memcached",
"php",
"redis",
"riak",
"xcache"
],
"time": "2019-11-11T01:40:42+00:00"
"time": "2019-11-15T14:31:57+00:00"
},
{
"name": "doctrine/dbal",
@@ -1381,16 +1389,16 @@
},
{
"name": "pixelant/pxa-social-feed",
"version": "v2.0.3",
"version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/pixelant/pxa_social_feed.git",
"reference": "d612540c186994197b0d433a0d468191104fe673"
"reference": "c095df535ddd0295dcc392fc2fbea2f659a7ec82"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/d612540c186994197b0d433a0d468191104fe673",
"reference": "d612540c186994197b0d433a0d468191104fe673",
"url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/c095df535ddd0295dcc392fc2fbea2f659a7ec82",
"reference": "c095df535ddd0295dcc392fc2fbea2f659a7ec82",
"shasum": ""
},
"require": {
@@ -1431,7 +1439,7 @@
}
],
"description": "Add Facebook, Instagram, and Twitter feeds to your site.",
"time": "2019-10-02T07:06:54+00:00"
"time": "2019-11-13T10:42:10+00:00"
},
{
"name": "psr/cache",
@@ -1827,16 +1835,16 @@
},
{
"name": "symfony/cache",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "30a51b2401ee15bfc7ea98bd7af0f9d80e26e649"
"reference": "83dca34362a0aba2b93aa1226dac6ef7cfea1262"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/30a51b2401ee15bfc7ea98bd7af0f9d80e26e649",
"reference": "30a51b2401ee15bfc7ea98bd7af0f9d80e26e649",
"url": "https://api.github.com/repos/symfony/cache/zipball/83dca34362a0aba2b93aa1226dac6ef7cfea1262",
"reference": "83dca34362a0aba2b93aa1226dac6ef7cfea1262",
"shasum": ""
},
"require": {
@@ -1901,7 +1909,7 @@
"caching",
"psr6"
],
"time": "2019-10-30T12:58:49+00:00"
"time": "2019-11-12T13:07:20+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -1963,16 +1971,16 @@
},
{
"name": "symfony/console",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78"
"reference": "831424efae0a1fe6642784bd52aae14ece6538e6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/136c4bd62ea871d00843d1bc0316de4c4a84bb78",
"reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78",
"url": "https://api.github.com/repos/symfony/console/zipball/831424efae0a1fe6642784bd52aae14ece6538e6",
"reference": "831424efae0a1fe6642784bd52aae14ece6538e6",
"shasum": ""
},
"require": {
@@ -2034,11 +2042,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2019-10-30T12:58:49+00:00"
"time": "2019-11-13T07:29:07+00:00"
},
{
"name": "symfony/expression-language",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
@@ -2089,7 +2097,7 @@
},
{
"name": "symfony/finder",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -2138,16 +2146,16 @@
},
{
"name": "symfony/http-client",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "9aea44c00dee78844f18c345009ef3f0fb3e1d0f"
"reference": "ae3a9cd491f1aadb5583f34a6bda5cca34081ce8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/9aea44c00dee78844f18c345009ef3f0fb3e1d0f",
"reference": "9aea44c00dee78844f18c345009ef3f0fb3e1d0f",
"url": "https://api.github.com/repos/symfony/http-client/zipball/ae3a9cd491f1aadb5583f34a6bda5cca34081ce8",
"reference": "ae3a9cd491f1aadb5583f34a6bda5cca34081ce8",
"shasum": ""
},
"require": {
@@ -2196,7 +2204,7 @@
],
"description": "Symfony HttpClient component",
"homepage": "https://symfony.com",
"time": "2019-10-31T07:19:20+00:00"
"time": "2019-11-08T08:23:45+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -2257,16 +2265,16 @@
},
{
"name": "symfony/inflector",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
"reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798"
"reference": "f97c69c132c08e31d291689d2d77bb0878094acb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/inflector/zipball/fc488a52c79b2bbe848fa9def35f2cccb47c4798",
"reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798",
"url": "https://api.github.com/repos/symfony/inflector/zipball/f97c69c132c08e31d291689d2d77bb0878094acb",
"reference": "f97c69c132c08e31d291689d2d77bb0878094acb",
"shasum": ""
},
"require": {
@@ -2311,11 +2319,11 @@
"symfony",
"words"
],
"time": "2019-09-17T11:12:06+00:00"
"time": "2019-11-05T19:58:22+00:00"
},
{
"name": "symfony/intl",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/intl.git",
@@ -2390,7 +2398,7 @@
},
{
"name": "symfony/options-resolver",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@@ -2794,7 +2802,7 @@
},
{
"name": "symfony/process",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -2843,7 +2851,7 @@
},
{
"name": "symfony/property-access",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
@@ -2910,16 +2918,16 @@
},
{
"name": "symfony/routing",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "63a9920cc86fcc745e5ea254e362f02b615290b9"
"reference": "533fd12a41fb9ce8d4e861693365427849487c0e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/63a9920cc86fcc745e5ea254e362f02b615290b9",
"reference": "63a9920cc86fcc745e5ea254e362f02b615290b9",
"url": "https://api.github.com/repos/symfony/routing/zipball/533fd12a41fb9ce8d4e861693365427849487c0e",
"reference": "533fd12a41fb9ce8d4e861693365427849487c0e",
"shasum": ""
},
"require": {
@@ -2982,20 +2990,20 @@
"uri",
"url"
],
"time": "2019-10-30T12:58:49+00:00"
"time": "2019-11-04T20:23:03+00:00"
},
{
"name": "symfony/serializer",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
"reference": "cb2d8c6e82b4966a5cc5762385e6e0f70ee1388a"
"reference": "18f30003dbe7178dcc1f75901ecb9f4937d146f5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/serializer/zipball/cb2d8c6e82b4966a5cc5762385e6e0f70ee1388a",
"reference": "cb2d8c6e82b4966a5cc5762385e6e0f70ee1388a",
"url": "https://api.github.com/repos/symfony/serializer/zipball/18f30003dbe7178dcc1f75901ecb9f4937d146f5",
"reference": "18f30003dbe7178dcc1f75901ecb9f4937d146f5",
"shasum": ""
},
"require": {
@@ -3062,7 +3070,7 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
"time": "2019-10-30T13:18:51+00:00"
"time": "2019-11-13T07:29:07+00:00"
},
{
"name": "symfony/service-contracts",
@@ -3124,16 +3132,16 @@
},
{
"name": "symfony/var-exporter",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
"reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2"
"reference": "097aa4c02954dabe9d508229be86213723973ac0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/d5b4e2d334c1d80e42876c7d489896cfd37562f2",
"reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/097aa4c02954dabe9d508229be86213723973ac0",
"reference": "097aa4c02954dabe9d508229be86213723973ac0",
"shasum": ""
},
"require": {
@@ -3180,11 +3188,11 @@
"instantiate",
"serialize"
],
"time": "2019-08-22T07:33:08+00:00"
"time": "2019-11-11T12:48:54+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.3.6",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -3554,21 +3562,21 @@
},
{
"name": "typo3/cms-composer-installers",
"version": "v2.2.2",
"version": "v2.2.3",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git",
"reference": "46437b54cf06c9c657a49283403b097943d7f524"
"reference": "7ecc2253e2d97a52824fcdd4e2f632bae9936810"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/46437b54cf06c9c657a49283403b097943d7f524",
"reference": "46437b54cf06c9c657a49283403b097943d7f524",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/7ecc2253e2d97a52824fcdd4e2f632bae9936810",
"reference": "7ecc2253e2d97a52824fcdd4e2f632bae9936810",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0",
"php": ">=7.0.0 <7.4"
"php": ">=7.0.0 <=7.4"
},
"conflict": {
"composer/installers": "<1.0.24 || >1.0.24"
@@ -3597,15 +3605,15 @@
"GPL-2.0-or-later"
],
"authors": [
{
"name": "The TYPO3 Community",
"homepage": "https://typo3.org/community/",
"role": "Contributor"
},
{
"name": "TYPO3 CMS Core Team",
"homepage": "https://forge.typo3.org/projects/typo3cms-core",
"role": "Developer"
},
{
"name": "The TYPO3 Community",
"homepage": "https://typo3.org/community/",
"role": "Contributor"
}
],
"description": "TYPO3 CMS Installers",
@@ -3617,7 +3625,7 @@
"installer",
"typo3"
],
"time": "2019-03-04T12:18:45+00:00"
"time": "2019-09-24T22:09:42+00:00"
},
{
"name": "typo3/cms-core",
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Events.vue
+5 -5
View File
@@ -17,15 +17,15 @@
</thead>
<tbody>
<tr v-for="event of events">
<td>{{ formatBookingDate(event.buchungsdatum) }}</td>
<td>{{ event.reisedatum | date }}</td>
<td>{{ event.reise }}</td>
<td>{{ formatBookingDate(event.dateBooking) }}</td>
<td>{{ event.dateTravel | date }}</td>
<td>{{ event.product }}</td>
<td>
<ul class="list-unstyled">
<li v-for="customer in event.customers">{{ customer.name }}, {{ customer.vorname }}</li>
<li v-for="customer in event.customers">{{ customer.lastName }}, {{ customer.firstName }}</li>
</ul>
</td>
<td style="white-space: nowrap">{{ event.preis }} €</td>
<td style="white-space: nowrap">{{ event.price }} €</td>
<td style="white-space: nowrap">{{ calculateBalance(event) }}</td>
<td>{{ status[event.status] }}</td>
<td>