From ada31e0b6d38b530bac54631ea0d197823434655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Mon, 20 Apr 2020 12:59:24 +0200 Subject: [PATCH 1/3] Increase selectable range to 20 months in calendar --- .../Resources/Private/Assets/js/components/Calendar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue index d72edf40..885f4051 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/Calendar.vue @@ -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++; From 906f926cab8a99b20354a725cd1e8be1b0d4c664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Mon, 20 Apr 2020 12:59:52 +0200 Subject: [PATCH 2/3] Fix webpack polling for good --- .ddev/docker-compose.env.yaml | 6 ------ .ddev/docker-compose.override.yaml | 9 +++++++++ package.json | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 .ddev/docker-compose.env.yaml create mode 100644 .ddev/docker-compose.override.yaml diff --git a/.ddev/docker-compose.env.yaml b/.ddev/docker-compose.env.yaml deleted file mode 100644 index 8bc5748b..00000000 --- a/.ddev/docker-compose.env.yaml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.6' - -services: - web: - environment: - - TYPO3_CONTEXT=Development diff --git a/.ddev/docker-compose.override.yaml b/.ddev/docker-compose.override.yaml new file mode 100644 index 00000000..9e605db8 --- /dev/null +++ b/.ddev/docker-compose.override.yaml @@ -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 diff --git a/package.json b/package.json index 4147395d..a989fa94 100644 --- a/package.json +++ b/package.json @@ -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": { From b4c94818b0d2918f53c4c86198f5f951f4400ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Mon, 20 Apr 2020 13:00:46 +0200 Subject: [PATCH 3/3] Update project dependencies --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 571c45e2..c2ad7d00 100644 --- a/composer.lock +++ b/composer.lock @@ -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",