Merge branch 'release/2020.04-03'
This commit is contained in:
@@ -1,6 +0,0 @@
|
||||
version: '3.6'
|
||||
|
||||
services:
|
||||
web:
|
||||
environment:
|
||||
- TYPO3_CONTEXT=Development
|
||||
@@ -0,0 +1,9 @@
|
||||
version: '3.6'
|
||||
|
||||
services:
|
||||
web:
|
||||
environment:
|
||||
- TYPO3_CONTEXT=Development
|
||||
- PHP_IDE_CONFIG=serverName=${DDEV_SITENAME}.ddev.site
|
||||
volumes:
|
||||
- ../public/typo3conf/ext/ep_theme/Resources/Private/Assets:/var/www/html/public/typo3conf/ext/ep_theme/Resources/Private/Assets:consistent
|
||||
Generated
+12
-12
@@ -149,16 +149,16 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/annotations",
|
||||
"version": "1.10.1",
|
||||
"version": "1.10.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/annotations.git",
|
||||
"reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb"
|
||||
"reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5eb79f3dbdffed6544e1fc287572c0f462bd29bb",
|
||||
"reference": "5eb79f3dbdffed6544e1fc287572c0f462bd29bb",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
|
||||
"reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -214,7 +214,7 @@
|
||||
"docblock",
|
||||
"parser"
|
||||
],
|
||||
"time": "2020-04-02T12:33:25+00:00"
|
||||
"time": "2020-04-20T09:18:32+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/cache",
|
||||
@@ -886,23 +886,24 @@
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/guzzle",
|
||||
"version": "6.5.2",
|
||||
"version": "6.5.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/guzzle/guzzle.git",
|
||||
"reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
|
||||
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
|
||||
"reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
|
||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
|
||||
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-json": "*",
|
||||
"guzzlehttp/promises": "^1.0",
|
||||
"guzzlehttp/psr7": "^1.6.1",
|
||||
"php": ">=5.5"
|
||||
"php": ">=5.5",
|
||||
"symfony/polyfill-intl-idn": "^1.11"
|
||||
},
|
||||
"require-dev": {
|
||||
"ext-curl": "*",
|
||||
@@ -910,7 +911,6 @@
|
||||
"psr/log": "^1.1"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
|
||||
"psr/log": "Required for using the Log middleware"
|
||||
},
|
||||
"type": "library",
|
||||
@@ -949,7 +949,7 @@
|
||||
"rest",
|
||||
"web service"
|
||||
],
|
||||
"time": "2019-12-23T11:57:10+00:00"
|
||||
"time": "2020-04-18T10:38:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "guzzlehttp/promises",
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
"license": "WTFPL",
|
||||
"repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
|
||||
"scripts": {
|
||||
"dev": "./node_modules/.bin/encore dev --watch --watch-poll",
|
||||
"dev": "./node_modules/.bin/encore dev --watch",
|
||||
"build": "./node_modules/.bin/encore production"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
const months = [];
|
||||
let month = this.startDate.month();
|
||||
let year = this.startDate.year();
|
||||
for (let i = 1; i <= 12; i++) {
|
||||
for (let i = 1; i <= 20; i++) {
|
||||
months.push(dayjs().set('year', year).set('month', month));
|
||||
if (month < 12) {
|
||||
month++;
|
||||
|
||||
Reference in New Issue
Block a user