From d89430e7d0163bc42451163a3b17575b69a06256 Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Wed, 13 Jan 2021 22:45:50 +0100 Subject: [PATCH 01/73] =?UTF-8?q?=E2=9C=A8=20init=20extensionCloseCall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/extensionCloseCall.ts | 29 ++++++ src/modules/generalExtensions/docs/de_DE.md | 6 ++ .../generalExtensions/i18n/de_DE.root.json | 94 ++++++++++--------- src/modules/generalExtensions/main.ts | 10 +- src/modules/generalExtensions/settings.ts | 4 + 5 files changed, 97 insertions(+), 46 deletions(-) create mode 100644 src/modules/generalExtensions/assets/extensionCloseCall.ts diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts new file mode 100644 index 0000000000..02fd9ec2fc --- /dev/null +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -0,0 +1,29 @@ +export default (LSSM: Vue): void => { + const observer = new MutationObserver(handleObserved); + const observertarget = document.getElementById('radio_messages_important'); + const observerOptions = { + childList: true, + }; + + function handleObserved() { + /* $('.radio_message_close').each(function () { + $(this) + .prev() + .addClass('radio_message_close') + .attr('vehicle_id', $(this).attr('vehicle_id')); + }); */ + const msgClose = document.getElementsByClassName('radio_message_close'); + for (let i = 0; i < msgClose.length; i++) { + let vid = msgClose[i].getAttribute('vehicle_id'); + let prev = msgClose[i].previousElementSibling; + if (prev === null || vid === null) { + return; + } + prev.classList.add('radio_message_close'); + prev.setAttribute('vehicle_id', vid); + } + } + if (window.location.pathname == '/' && observertarget != null) { + observer.observe(observertarget, observerOptions); + } +}; diff --git a/src/modules/generalExtensions/docs/de_DE.md b/src/modules/generalExtensions/docs/de_DE.md index 0078cf3e34..7e90bd9c90 100644 --- a/src/modules/generalExtensions/docs/de_DE.md +++ b/src/modules/generalExtensions/docs/de_DE.md @@ -68,3 +68,9 @@ Mittels `←` und `→` kannst du auch durch die Vorschläge durchwechseln und m ::: Als zusätzliches Feature werden sog. gängige Shortcuts automatisch ersetzt. Zum Beispiel wird `;)` in `😉` ersetzt, sobald du ein Leerzeichen dahinter setzt. + +## Ausbreitung verbesserter FMS 5 + +Nervt es dich auch das bei Ausbreitungen der Sprechwunsch beim Klick auf "zum Einsatz" nicht beendet wird? Diese kleine Erweiterung fügt genau das ein. + +Ausbreitungssprechwünsche werden auch beim Klick auf "zum Einsatz" geschlossen. \ No newline at end of file diff --git a/src/modules/generalExtensions/i18n/de_DE.root.json b/src/modules/generalExtensions/i18n/de_DE.root.json index 57af115ed5..60f22bd9aa 100644 --- a/src/modules/generalExtensions/i18n/de_DE.root.json +++ b/src/modules/generalExtensions/i18n/de_DE.root.json @@ -1,46 +1,50 @@ { - "description": "Ermöglicht dir allgemeine Verbesserungen, wie z.B klickbare Links im gesamten Spiel zu aktivieren.", - "name": "Allgemeine Verbesserungen", - "settings": { - "browserTitle": { - "description": "Passt den Titel des Browsertabs an, so dass da steht, was im Spiel gerade offen ist.", - "title": "Titel des Browsertabs" - }, - "clickableLinks": { - "description": "Links die in als reiner Text angezeigt werden (z.B. im Chat, Forum, Nachrichten, etc.) werden anklickbar gemacht. Sie öffnen sich automatisch in einem neuen Tab.", - "title": "Links anklickbar machen" - }, - "emojiPicker": { - "description": "Zeigt dir Emojis zur auswahl an, wenn du : gefolgt von Text eingibst.", - "title": "Emoji-Picker" - }, - "linkPreviews": { - "buildings": "Gebäude", - "description": "Zeigt eine kleine Infobox an, wenn du mit der Maus kurz über einem Link wartest. Du kannst hier einstellen, bei welchen Links die Infobox aktiviert sein soll:", - "missions": "Einsätze", - "profile": "Nutzer", - "title": "Link-Vorschau", - "vehicles": "Fahrzeuge" - }, - "mapUndo": { - "description": "Zentriere Karte auf Positionen, auf die vorher zentriert wurde. – Funktioniert aktuell nur beim Kartentyp \"OpenStreetMap\"", - "title": "Kartensprünge speichern" - }, - "ownMapMarkers": { - "description": "Speichere dir eigene Punkte auf der Karte ab, damit du sie schnell und mittels eines einzelnen Klicks verfügbar hast!", - "title": "Lesezeichen für die Karte" - }, - "saveLastBuildingType": { - "description": "Speichert im \"Gebäude Bauen\"-Menü, welchen Gebäude-Typ du zuletzt ausgewählt hattest und wählt diesen automatisch aus.", - "title": "Gebäude-Typ merken" - }, - "saveLastDispatchCenter": { - "description": "Speichert im \"Gebäude Bauen\"-Menü, welche Leitstelle du zuletzt ausgewählt hattest und wählt diese automatisch aus.", - "title": "Leitstelle merken" - }, - "showImg": { - "description": "Versuchen, eine Bildvorschau zu generieren. Funktioniert nur in Kombination mit \"Links anklickbar machen\"!", - "title": "Bildvorschau aktivieren" - } - } -} \ No newline at end of file + "description": "Ermöglicht dir allgemeine Verbesserungen, wie z.B klickbare Links im gesamten Spiel zu aktivieren.", + "name": "Allgemeine Verbesserungen", + "settings": { + "browserTitle": { + "description": "Passt den Titel des Browsertabs an, so dass da steht, was im Spiel gerade offen ist.", + "title": "Titel des Browsertabs" + }, + "clickableLinks": { + "description": "Links die in als reiner Text angezeigt werden (z.B. im Chat, Forum, Nachrichten, etc.) werden anklickbar gemacht. Sie öffnen sich automatisch in einem neuen Tab.", + "title": "Links anklickbar machen" + }, + "emojiPicker": { + "description": "Zeigt dir Emojis zur auswahl an, wenn du : gefolgt von Text eingibst.", + "title": "Emoji-Picker" + }, + "linkPreviews": { + "buildings": "Gebäude", + "description": "Zeigt eine kleine Infobox an, wenn du mit der Maus kurz über einem Link wartest. Du kannst hier einstellen, bei welchen Links die Infobox aktiviert sein soll:", + "missions": "Einsätze", + "profile": "Nutzer", + "title": "Link-Vorschau", + "vehicles": "Fahrzeuge" + }, + "mapUndo": { + "description": "Zentriere Karte auf Positionen, auf die vorher zentriert wurde. – Funktioniert aktuell nur beim Kartentyp \"OpenStreetMap\"", + "title": "Kartensprünge speichern" + }, + "ownMapMarkers": { + "description": "Speichere dir eigene Punkte auf der Karte ab, damit du sie schnell und mittels eines einzelnen Klicks verfügbar hast!", + "title": "Lesezeichen für die Karte" + }, + "saveLastBuildingType": { + "description": "Speichert im \"Gebäude Bauen\"-Menü, welchen Gebäude-Typ du zuletzt ausgewählt hattest und wählt diesen automatisch aus.", + "title": "Gebäude-Typ merken" + }, + "saveLastDispatchCenter": { + "description": "Speichert im \"Gebäude Bauen\"-Menü, welche Leitstelle du zuletzt ausgewählt hattest und wählt diese automatisch aus.", + "title": "Leitstelle merken" + }, + "showImg": { + "description": "Versuchen, eine Bildvorschau zu generieren. Funktioniert nur in Kombination mit \"Links anklickbar machen\"!", + "title": "Bildvorschau aktivieren" + }, + "extensionCloseCall": { + "description": "Schließt Ausbreitungssprechwünsche auch bei drücken des Buttons \"zum Einsatz\".", + "title": "Ausbreitung verbesserter FMS 5" + } + } +} diff --git a/src/modules/generalExtensions/main.ts b/src/modules/generalExtensions/main.ts index 01918afc0a..27ef971619 100644 --- a/src/modules/generalExtensions/main.ts +++ b/src/modules/generalExtensions/main.ts @@ -61,6 +61,14 @@ export default (async (LSSM, MODULE_ID, $m) => { ) ).default(LSSM, mapUndo, ownMapMarkers, getSetting, MODULE_ID); } + const extensionCloseCall = await getSetting('extensionCloseCall'); + if (window.location.pathname === '/') { + await ( + await import( + /* webpackChunkName: "modules/generalExtensions/mapMarkers" */ './assets/extensionCloseCall' + ) + ).default(LSSM); + } const saveLastBuildingType = await getSetting( 'saveLastBuildingType' ); @@ -109,7 +117,7 @@ export default (async (LSSM, MODULE_ID, $m) => { ) ).default( LSSM, - t => $m(`protocolDeletionConfirmation.${t}`), + (t) => $m(`protocolDeletionConfirmation.${t}`), !!(await getSetting('deleteSingleProtocolEntry')), MODULE_ID ); diff --git a/src/modules/generalExtensions/settings.ts b/src/modules/generalExtensions/settings.ts index f89f200b18..2ed604357a 100644 --- a/src/modules/generalExtensions/settings.ts +++ b/src/modules/generalExtensions/settings.ts @@ -54,4 +54,8 @@ export default (() => ({ deleteSingleProtocolEntry: { type: 'hidden', }, + extensionCloseCall: { + type: 'toggle', + default: true, + }, })) as ModuleSettingFunction; From c072bffcea2c2e386ecfdd0b66820c85e8f1014d Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Wed, 13 Jan 2021 23:00:56 +0100 Subject: [PATCH 02/73] =?UTF-8?q?=F0=9F=8E=A8=20removed=20debug=20stuff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/generalExtensions/assets/extensionCloseCall.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 02fd9ec2fc..0eb9ff4152 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -6,12 +6,6 @@ export default (LSSM: Vue): void => { }; function handleObserved() { - /* $('.radio_message_close').each(function () { - $(this) - .prev() - .addClass('radio_message_close') - .attr('vehicle_id', $(this).attr('vehicle_id')); - }); */ const msgClose = document.getElementsByClassName('radio_message_close'); for (let i = 0; i < msgClose.length; i++) { let vid = msgClose[i].getAttribute('vehicle_id'); From e43c2d39d783f03ccc1c8efbd61fccb98e0bede4 Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Wed, 13 Jan 2021 23:22:02 +0100 Subject: [PATCH 03/73] =?UTF-8?q?=F0=9F=8E=A8=20=F0=9F=9A=A8=20should=20ma?= =?UTF-8?q?ke=20eslint=20happy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generalExtensions/assets/extensionCloseCall.ts | 2 +- src/modules/generalExtensions/main.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 0eb9ff4152..5ca5676345 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,4 +1,4 @@ -export default (LSSM: Vue): void => { +export default (): void => { const observer = new MutationObserver(handleObserved); const observertarget = document.getElementById('radio_messages_important'); const observerOptions = { diff --git a/src/modules/generalExtensions/main.ts b/src/modules/generalExtensions/main.ts index 27ef971619..618d95429f 100644 --- a/src/modules/generalExtensions/main.ts +++ b/src/modules/generalExtensions/main.ts @@ -61,13 +61,15 @@ export default (async (LSSM, MODULE_ID, $m) => { ) ).default(LSSM, mapUndo, ownMapMarkers, getSetting, MODULE_ID); } - const extensionCloseCall = await getSetting('extensionCloseCall'); - if (window.location.pathname === '/') { + if ( + window.location.pathname === '/' && + (await getSetting('extensionCloseCall')) + ) { await ( await import( - /* webpackChunkName: "modules/generalExtensions/mapMarkers" */ './assets/extensionCloseCall' + /* webpackChunkName: "modules/generalExtensions/extensionCloseCall" */ './assets/extensionCloseCall' ) - ).default(LSSM); + ).default(); } const saveLastBuildingType = await getSetting( 'saveLastBuildingType' From c518764c27d80214f0a34b6c7847d7a8828a8a23 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 13 Jan 2021 22:23:11 +0000 Subject: [PATCH 04/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0113.2220=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/nl_NL.ts | 11 +++++++---- src/modules/extendedCallWindow/i18n/nl_NL.js | 15 ++++++++++++++- src/modules/missionHelper/settings.ts | 10 +++++----- static/lssm-v4.user.js | 2 +- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 5b162db8c6..33544dc0d5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210113.2245", + "version": "4.1.11-pre1+20210113.2220", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/i18n/nl_NL.ts b/src/i18n/nl_NL.ts index 6055d417e5..9b67e80628 100644 --- a/src/i18n/nl_NL.ts +++ b/src/i18n/nl_NL.ts @@ -211,7 +211,8 @@ export default { maxPersonnel: 9, credits: 17_300, coins: 25, - special: 'Benodigd vanaf 7 brandweerposten. De slangenwagen zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 15%', + special: + 'Benodigd vanaf 7 brandweerposten. De slangenwagen zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 15%', icon: 'truck-moving', }, 11: { @@ -577,7 +578,8 @@ export default { maxPersonnel: 0, credits: 6_000, coins: 12, - special: 'Haakarmvoertuig benodigd. Deze haakarmbak zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 25%', + special: + 'Haakarmvoertuig benodigd. Deze haakarmbak zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 25%', icon: 'square', }, 46: { @@ -749,7 +751,8 @@ export default { maxPersonnel: 0, credits: 6_000, coins: 12, - special: 'Haakarmvoertuig benodigd. Deze haakarmbak zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 15%', + special: + 'Haakarmvoertuig benodigd. Deze haakarmbak zorgt dat de aanwezige waterhoeveelheid wordt verhoogd met 15%', icon: 'square', }, 62: { @@ -1171,7 +1174,7 @@ export default { 31, 34, 56, - 62 + 62, ], 'Waterongevallen': [33, 36, 49, 50], 'Vliegtuigbrandbestrijding': [41, 42, 43, 44], diff --git a/src/modules/extendedCallWindow/i18n/nl_NL.js b/src/modules/extendedCallWindow/i18n/nl_NL.js index 96a41e4739..53b9b54cb2 100644 --- a/src/modules/extendedCallWindow/i18n/nl_NL.js +++ b/src/modules/extendedCallWindow/i18n/nl_NL.js @@ -92,7 +92,20 @@ module.exports = { }, selected: 'Geselecteerd', vehiclesByRequirement: { - [/^Tankautospuit(en)?$/]: [0, 1, 6, 7, 8, 9, 12, 14, 15, 17, 50, 62], + [/^Tankautospuit(en)?$/]: [ + 0, + 1, + 6, + 7, + 8, + 9, + 12, + 14, + 15, + 17, + 50, + 62, + ], [/^Redvoertuig(en)?$/]: [2, 18], [/^Officier(en)? van Dienst - Brandweer$/]: [3, 19], [/^Hulpverleningsvoertuig(en)?$/]: [4, 51, 62], diff --git a/src/modules/missionHelper/settings.ts b/src/modules/missionHelper/settings.ts index 1461243d98..2767c44f0b 100644 --- a/src/modules/missionHelper/settings.ts +++ b/src/modules/missionHelper/settings.ts @@ -75,11 +75,11 @@ export default ((MODULE_ID, LSSM, $m) => { default: false, dependsOn: '.chances.normal', }, - 'multifunctionals.heavy_rescue_vehicles': { - type: 'toggle', - default: false, - dependsOn: '.vehicles.content', - }, + 'multifunctionals.heavy_rescue_vehicles': { + type: 'toggle', + default: false, + dependsOn: '.vehicles.content', + }, 'multifunctionals.battalion_chief_vehicles': { type: 'toggle', default: false, diff --git a/static/lssm-v4.user.js b/static/lssm-v4.user.js index 8ae47fbc71..7cb91364c9 100644 --- a/static/lssm-v4.user.js +++ b/static/lssm-v4.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name LSS-Manager V.4 -// @version 4.1.10-p1+CZ-DK-DE-AU-GB-US-ES-MX-FI-FR-IT-JP-KR-NO-NL-PL-BR-PT-RO-RU-SK-SE-TR-UA +// @version 4.1.11-pre1+CZ-DK-DE-AU-GB-US-ES-MX-FI-FR-IT-JP-KR-NO-NL-PL-BR-PT-RO-RU-SK-SE-TR-UA // @author Aisaka | Sanni | Jan (jxn_30) | Ron31 // @description Das Tool für das LSS in der Version 4 // @include /^https?:\/\/(?:w{3}\.)?(?:(policie\.)?operacni-stredisko\.cz|(politi\.)?alarmcentral-spil\.dk|(polizei\.)?leitstellenspiel\.de|(?:(police\.)?missionchief-australia|(police\.)?missionchief|(poliisi\.)?hatakeskuspeli|missionchief-japan|missionchief-korea|(politiet\.)?nodsentralspillet|(politie\.)?meldkamerspel|operador193|(policia\.)?jogo-operador112|jocdispecerat112|dispecerske-centrum|112-merkez|dyspetcher101-game)\.com|(police\.)?missionchief\.co\.uk|centro-de-mando\.es|centro-de-mando\.mx|(police\.)?operateur112\.fr|(polizia\.)?operatore112\.it|(policja\.)?operatorratunkowy\.pl|dispetcher112\.ru|(polis\.)?larmcentralen-spelet\.se)\/.*$/ From 2cd666db0ac74f493f936327f7a8e08bb43024db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 02:06:10 +0000 Subject: [PATCH 05/73] :arrow_up:(deps): Bump @fortawesome/free-solid-svg-icons Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 5.15.1 to 5.15.2. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.15.1...5.15.2) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 33544dc0d5..756dfc862b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.32", - "@fortawesome/free-solid-svg-icons": "^5.15.1", + "@fortawesome/free-solid-svg-icons": "^5.15.2", "@fortawesome/vue-fontawesome": "^2.0.2", "broadcast-channel": "^3.3.0", "combokeys": "^3.0.1", diff --git a/yarn.lock b/yarn.lock index d214365f4f..14ca9e40af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -884,10 +884,10 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@^0.2.32": - version "0.2.32" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz#3436795d5684f22742989bfa08f46f50f516f259" - integrity sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w== +"@fortawesome/fontawesome-common-types@^0.2.32", "@fortawesome/fontawesome-common-types@^0.2.34": + version "0.2.34" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915" + integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA== "@fortawesome/fontawesome-svg-core@^1.2.32": version "1.2.32" @@ -896,12 +896,12 @@ dependencies: "@fortawesome/fontawesome-common-types" "^0.2.32" -"@fortawesome/free-solid-svg-icons@^5.15.1": - version "5.15.1" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz#e1432676ddd43108b41197fee9f86d910ad458ef" - integrity sha512-EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg== +"@fortawesome/free-solid-svg-icons@^5.15.2": + version "5.15.2" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz#25bb035de57cf85aee8072965732368ccc8e8943" + integrity sha512-ZfCU+QjaFsdNZmOGmfqEWhzI3JOe37x5dF4kz9GeXvKn/sTxhqMtZ7mh3lBf76SvcYY5/GKFuyG7p1r4iWMQqw== dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.32" + "@fortawesome/fontawesome-common-types" "^0.2.34" "@fortawesome/vue-fontawesome@^2.0.2": version "2.0.2" From 741bad6cb0155d81a4a7ea0864ac726f48ab9f97 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 14 Jan 2021 06:20:15 +0000 Subject: [PATCH 06/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0114.0617=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 756dfc862b..63def4f70b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210113.2220", + "version": "4.1.11-pre1+20210114.0617", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 9a06968289..27678186b9 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -7,7 +7,7 @@ "@fortawesome/free-solid-svg-icons": { "icon": "https://fontawesome.com/images/favicons/apple-icon-180x180.png", "url": "https://fontawesome.com", - "version": "5.15.1" + "version": "5.15.2" }, "@fortawesome/vue-fontawesome": { "icon": "https://fontawesome.com/images/favicons/apple-icon-180x180.png", From 19c7dd383408eb0b369c0b0a30a888c92f261533 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jan 2021 07:31:54 +0000 Subject: [PATCH 07/73] :arrow_up:(deps): Bump @fortawesome/fontawesome-svg-core Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 1.2.32 to 1.2.34. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/commits) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 63def4f70b..cd7d9e8226 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "tsc:docs": "tsc -b scripts && node scripts tscDocs" }, "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.32", + "@fortawesome/fontawesome-svg-core": "^1.2.34", "@fortawesome/free-solid-svg-icons": "^5.15.2", "@fortawesome/vue-fontawesome": "^2.0.2", "broadcast-channel": "^3.3.0", diff --git a/yarn.lock b/yarn.lock index 14ca9e40af..b7587c38c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -884,17 +884,17 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@^0.2.32", "@fortawesome/fontawesome-common-types@^0.2.34": +"@fortawesome/fontawesome-common-types@^0.2.34": version "0.2.34" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz#0a8c348bb23b7b760030f5b1d912e582be4ec915" integrity sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA== -"@fortawesome/fontawesome-svg-core@^1.2.32": - version "1.2.32" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz#da092bfc7266aa274be8604de610d7115f9ba6cf" - integrity sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ== +"@fortawesome/fontawesome-svg-core@^1.2.34": + version "1.2.34" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz#1d1a7c92537cbc2b8a83eef6b6d824b4b5b46b26" + integrity sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg== dependencies: - "@fortawesome/fontawesome-common-types" "^0.2.32" + "@fortawesome/fontawesome-common-types" "^0.2.34" "@fortawesome/free-solid-svg-icons@^5.15.2": version "5.15.2" From 0f195102ecccf35198bcc1b8a2560b073f2d87a4 Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Thu, 14 Jan 2021 11:07:45 +0100 Subject: [PATCH 08/73] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=F0=9F=8E=A8=20exten?= =?UTF-8?q?sion=20close=20changed=20mutOb=20to=20EL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/extensionCloseCall.ts | 26 ++++++++++++++----- src/modules/generalExtensions/main.ts | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 5ca5676345..685f7245ac 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,11 +1,15 @@ export default (): void => { - const observer = new MutationObserver(handleObserved); + /* const observer = new MutationObserver(handleObserved); const observertarget = document.getElementById('radio_messages_important'); const observerOptions = { childList: true, - }; - - function handleObserved() { + }; */ + const ListenerTarget = document.getElementById('radio_messages_important'); + if (ListenerTarget == null || window.location.pathname != '/') { + return; + } + ListenerTarget.addEventListener('click', handleListen); + /* function handleObserved() { const msgClose = document.getElementsByClassName('radio_message_close'); for (let i = 0; i < msgClose.length; i++) { let vid = msgClose[i].getAttribute('vehicle_id'); @@ -16,8 +20,16 @@ export default (): void => { prev.classList.add('radio_message_close'); prev.setAttribute('vehicle_id', vid); } - } - if (window.location.pathname == '/' && observertarget != null) { - observer.observe(observertarget, observerOptions); + } */ + function handleListen(event: { target: any; }) { + const clickedBtn = event.target; + + if (clickedBtn.nextElementSibling.hasAttribute('vehicle_id')) { + clickedBtn.classList.add('radio_message_close'); + clickedBtn.setAttribute( + 'vehicle_id', + clickedBtn.nextElementSibling.getAttribute('vehicle_id') + ); + } } }; diff --git a/src/modules/generalExtensions/main.ts b/src/modules/generalExtensions/main.ts index 618d95429f..da4dc1dc9b 100644 --- a/src/modules/generalExtensions/main.ts +++ b/src/modules/generalExtensions/main.ts @@ -65,7 +65,7 @@ export default (async (LSSM, MODULE_ID, $m) => { window.location.pathname === '/' && (await getSetting('extensionCloseCall')) ) { - await ( + ( await import( /* webpackChunkName: "modules/generalExtensions/extensionCloseCall" */ './assets/extensionCloseCall' ) From 7e3d9eb14d7507d4684f9be11eac71aa7bfb1afc Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Thu, 14 Jan 2021 11:08:38 +0100 Subject: [PATCH 09/73] =?UTF-8?q?=F0=9F=8E=A8=20removed=20debug=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/extensionCloseCall.ts | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 685f7245ac..7f35dd2cce 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,27 +1,10 @@ export default (): void => { - /* const observer = new MutationObserver(handleObserved); - const observertarget = document.getElementById('radio_messages_important'); - const observerOptions = { - childList: true, - }; */ const ListenerTarget = document.getElementById('radio_messages_important'); if (ListenerTarget == null || window.location.pathname != '/') { return; } ListenerTarget.addEventListener('click', handleListen); - /* function handleObserved() { - const msgClose = document.getElementsByClassName('radio_message_close'); - for (let i = 0; i < msgClose.length; i++) { - let vid = msgClose[i].getAttribute('vehicle_id'); - let prev = msgClose[i].previousElementSibling; - if (prev === null || vid === null) { - return; - } - prev.classList.add('radio_message_close'); - prev.setAttribute('vehicle_id', vid); - } - } */ - function handleListen(event: { target: any; }) { + function handleListen(event: { target: any }) { const clickedBtn = event.target; if (clickedBtn.nextElementSibling.hasAttribute('vehicle_id')) { From ed4ed2261602591d401afa0c93d59210a9880e40 Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 15 Jan 2021 00:32:55 +0000 Subject: [PATCH 10/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0115.0024=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cd7d9e8226..fe5a23eb4e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210114.0617", + "version": "4.1.11-pre1+20210115.0024", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 27678186b9..7108ceba41 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -2,7 +2,7 @@ "@fortawesome/fontawesome-svg-core": { "icon": "https://fontawesome.com/images/favicons/apple-icon-180x180.png", "url": "https://fontawesome.com", - "version": "1.2.32" + "version": "1.2.34" }, "@fortawesome/free-solid-svg-icons": { "icon": "https://fontawesome.com/images/favicons/apple-icon-180x180.png", From 0397c9486847ee923c8a0b99618c1791b97f06ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 02:08:52 +0000 Subject: [PATCH 11/73] :arrow_up:(deps-dev): Bump @types/node from 14.14.20 to 14.14.21 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.20 to 14.14.21. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fe5a23eb4e..0c4ae64de7 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@types/jquery": "^3.5.5", "@types/leaflet": "^1.5.19", "@types/lodash": "^4.14.167", - "@types/node": "^14.14.20", + "@types/node": "^14.14.21", "@types/pdfmake": "^0.1.16", "@types/semver": "^7.3.4", "@types/showdown": "^1.9.3", diff --git a/yarn.lock b/yarn.lock index b7587c38c5..d29b34e25e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1058,10 +1058,10 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^14.14.20": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== +"@types/node@*", "@types/node@^14.14.21": + version "14.14.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" + integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== "@types/pdfkit@*": version "0.10.6" From f1ddc967c75266aeb7d4f68f148d7f51e6d66dfb Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 15 Jan 2021 07:28:04 +0000 Subject: [PATCH 12/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0115.0724=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0c4ae64de7..9bf4a4d617 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210115.0024", + "version": "4.1.11-pre1+20210115.0724", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 7108ceba41..96d02d4c0c 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -30,7 +30,7 @@ "version": "4.14.167" }, "@types/node": { - "version": "14.14.20" + "version": "14.14.21" }, "@types/pdfmake": { "version": "0.1.16" From 76e516be74ffe6ff54f8f25c63945fc255a08df6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 07:38:53 +0000 Subject: [PATCH 13/73] :arrow_up:(deps-dev): Bump @types/leaflet from 1.5.19 to 1.5.20 Bumps [@types/leaflet](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet) from 1.5.19 to 1.5.20. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9bf4a4d617..5ce9f0e180 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@types/combokeys": "^2.4.6", "@types/i18n-js": "^3.8.0", "@types/jquery": "^3.5.5", - "@types/leaflet": "^1.5.19", + "@types/leaflet": "^1.5.20", "@types/lodash": "^4.14.167", "@types/node": "^14.14.21", "@types/pdfmake": "^0.1.16", diff --git a/yarn.lock b/yarn.lock index d29b34e25e..0e440ccc48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1041,10 +1041,10 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== -"@types/leaflet@^1.5.19": - version "1.5.19" - resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.5.19.tgz#f290e21fe7a4744d68bb4b0709e99ce490120e6e" - integrity sha512-ZAKqfvdU/+KFoCpf8aUba09F8mfSc8R2esq++Cha3E2DgwS5K/I/4eJ+0JylrVHZivgY7PSAeXFv/izP+81/MQ== +"@types/leaflet@^1.5.20": + version "1.5.20" + resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.5.20.tgz#b7a06a6c6a3f3ee06fb35cfa6e13194939883922" + integrity sha512-0H3F45Qb41ZLDjnichyrv9ts9KjijzN9acNt/i657jMcWFwHvZogBsBzBbUb3cwHyOxX/2qEMegacaHsXq23YA== dependencies: "@types/geojson" "*" From 4c8df4761395d50af46130cad0695265640f3401 Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 15 Jan 2021 08:02:35 +0000 Subject: [PATCH 14/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0115.0800=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5ce9f0e180..742df73fad 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210115.0724", + "version": "4.1.11-pre1+20210115.0800", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 96d02d4c0c..622df90164 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -24,7 +24,7 @@ "version": "3.5.5" }, "@types/leaflet": { - "version": "1.5.19" + "version": "1.5.20" }, "@types/lodash": { "version": "4.14.167" From 39e541b21a685207a49db559f759a494c336ba5f Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:15:47 +0100 Subject: [PATCH 15/73] =?UTF-8?q?=F0=9F=8E=A8=20removed=20double=20urlchec?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/generalExtensions/assets/extensionCloseCall.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 7f35dd2cce..f3d4a90a35 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,9 +1,9 @@ export default (): void => { - const ListenerTarget = document.getElementById('radio_messages_important'); - if (ListenerTarget == null || window.location.pathname != '/') { + const listenerTarget = document.getElementById('radio_messages_important'); + if (listenerTarget == null) { return; } - ListenerTarget.addEventListener('click', handleListen); + listenerTarget.addEventListener('click', handleListen); function handleListen(event: { target: any }) { const clickedBtn = event.target; From 9caf791c9e8a322593315cca77ffe0eedd5ff6bc Mon Sep 17 00:00:00 2001 From: Cr4zyc4k3 <69073372+Cr4zyc4k3@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:53:52 +0100 Subject: [PATCH 16/73] =?UTF-8?q?=F0=9F=8E=A8=20code=20shortend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/generalExtensions/assets/extensionCloseCall.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index f3d4a90a35..7707507d1e 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,8 +1,6 @@ export default (): void => { const listenerTarget = document.getElementById('radio_messages_important'); - if (listenerTarget == null) { - return; - } + if (!listenerTarget) return; listenerTarget.addEventListener('click', handleListen); function handleListen(event: { target: any }) { const clickedBtn = event.target; From ee77b385528ff5e95c7949b943385b3f66013682 Mon Sep 17 00:00:00 2001 From: Ron31 Date: Fri, 15 Jan 2021 11:17:28 +0100 Subject: [PATCH 17/73] =?UTF-8?q?=E2=9C=A8=20[asyncButtons]=20async=20pers?= =?UTF-8?q?onal=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asyncButtons/assets/buildingPersonal.ts | 69 +++++++++++++++++++ src/modules/asyncButtons/i18n/de_DE.json | 8 +++ src/modules/asyncButtons/i18n/de_DE.root.json | 4 ++ src/modules/asyncButtons/i18n/en_AU.json | 8 +++ src/modules/asyncButtons/i18n/en_AU.root.json | 4 ++ src/modules/asyncButtons/i18n/en_GB.json | 8 +++ src/modules/asyncButtons/i18n/en_GB.root.json | 4 ++ src/modules/asyncButtons/i18n/en_US.json | 8 +++ src/modules/asyncButtons/i18n/en_US.root.json | 4 ++ src/modules/asyncButtons/main.ts | 11 +++ src/modules/asyncButtons/register.json | 2 +- src/modules/asyncButtons/settings.ts | 4 ++ 12 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 src/modules/asyncButtons/assets/buildingPersonal.ts diff --git a/src/modules/asyncButtons/assets/buildingPersonal.ts b/src/modules/asyncButtons/assets/buildingPersonal.ts new file mode 100644 index 0000000000..857bca2673 --- /dev/null +++ b/src/modules/asyncButtons/assets/buildingPersonal.ts @@ -0,0 +1,69 @@ +import { $m } from 'typings/Module'; + +export default (LSSM: Vue, $m: $m, MODULE_ID: string): void => { + const $sm = (key: string, args?: Parameters<$m>[1]) => + $m(`buildingPersonal.${key}`, args); + const btns = Array.from( + document.querySelectorAll( + 'a[href^="/personals/"][data-method="delete"]' + ) as NodeListOf + ); + btns.forEach(btn => { + btn.addEventListener('click', async e => { + e.preventDefault(); + btn.removeAttribute('data-confirm'); + btn.removeAttribute('data-method'); + LSSM.$modal.show('dialog', { + title: $sm('deleteModal.title'), + text: $sm('deleteModal.text'), + buttons: [ + { + title: $sm('deleteModal.btnCancel'), + default: true, + handler() { + LSSM.$modal.hide('dialog'); + }, + }, + { + title: $sm('deleteModal.btnConfirm'), + async handler() { + const url = new URL(btn.href); + url.searchParams.append('_method', 'delete'); + url.searchParams.append( + 'authenticity_token', + document + .querySelector('meta[name="csrf-token"]') + ?.getAttribute('content') || '' + ); + await LSSM.$store + .dispatch('api/request', { + url: btn.href, + init: { + method: 'POST', + body: url.searchParams.toString(), + credentials: 'include', + mode: 'cors', + headers: { + 'Accept': + 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8', + 'Content-Type': + 'application/x-www-form-urlencoded', + 'Upgrade-Insecure-Requests': '1', + }, + }, + feature: `${MODULE_ID}-buildingPersonal`, + }) + .then(({ status }) => { + if (status !== 200) return; + btn.parentElement?.parentElement?.parentElement?.classList.add( + 'hide' + ); + }); + LSSM.$modal.hide('dialog'); + }, + }, + ], + }); + }); + }); +}; diff --git a/src/modules/asyncButtons/i18n/de_DE.json b/src/modules/asyncButtons/i18n/de_DE.json index 128857cde2..693469cabf 100644 --- a/src/modules/asyncButtons/i18n/de_DE.json +++ b/src/modules/asyncButtons/i18n/de_DE.json @@ -1,4 +1,12 @@ { + "buildingPersonal": { + "deleteModal": { + "btnCancel": "Abbrechen", + "btnConfirm": "Kündigen", + "text": "Möchtest du diese Person kündigen?", + "title": "Kündigen?" + } + }, "deleteARR": { "deleteModal": { "btnCancel": "Abbrechen", diff --git a/src/modules/asyncButtons/i18n/de_DE.root.json b/src/modules/asyncButtons/i18n/de_DE.root.json index c1f98a2f38..3f2184ef80 100644 --- a/src/modules/asyncButtons/i18n/de_DE.root.json +++ b/src/modules/asyncButtons/i18n/de_DE.root.json @@ -2,6 +2,10 @@ "description": "Vermeide mit diesem Modul, dass das Spiel neu geladen wird, wenn du bestimmte Knöpfe drückst.", "name": "Asynchrone Knöpfe", "settings": { + "buildingPersonal": { + "description": "Verhindert ein Neuladen, wenn du einer Person kündigst.", + "title": "Personal Kündigen" + }, "buildingTax": { "description": "Verhindert ein Neuladen, wenn du die Kosten von eigenen Zellen oder Krankenhausbetten festlegst.", "title": "Kostenübernahme von Zellen und Betten" diff --git a/src/modules/asyncButtons/i18n/en_AU.json b/src/modules/asyncButtons/i18n/en_AU.json index b33b893b9e..ea73879301 100644 --- a/src/modules/asyncButtons/i18n/en_AU.json +++ b/src/modules/asyncButtons/i18n/en_AU.json @@ -1,4 +1,12 @@ { + "buildingPersonal": { + "deleteModal": { + "btnCancel": "Cancel", + "btnConfirm": "Release", + "text": "Are you sure you want to release this person?", + "title": "Releasing?" + } + }, "deleteARR": { "deleteModal": { "btnCancel": "Cancel", diff --git a/src/modules/asyncButtons/i18n/en_AU.root.json b/src/modules/asyncButtons/i18n/en_AU.root.json index fcf96b36b3..8c147fbeab 100644 --- a/src/modules/asyncButtons/i18n/en_AU.root.json +++ b/src/modules/asyncButtons/i18n/en_AU.root.json @@ -2,6 +2,10 @@ "description": "Avoid with this module that the game is reloaded when you press certain buttons.", "name": "Asynchronous buttons", "settings": { + "buildingPersonal": { + "description": "Prevents reloading when you release personal.", + "title": "Release of personal" + }, "buildingTax": { "description": "Prevents recharging when you set the cost of own cells or hospital beds.", "title": "Cost absorption of cells and beds" diff --git a/src/modules/asyncButtons/i18n/en_GB.json b/src/modules/asyncButtons/i18n/en_GB.json index b33b893b9e..ea73879301 100644 --- a/src/modules/asyncButtons/i18n/en_GB.json +++ b/src/modules/asyncButtons/i18n/en_GB.json @@ -1,4 +1,12 @@ { + "buildingPersonal": { + "deleteModal": { + "btnCancel": "Cancel", + "btnConfirm": "Release", + "text": "Are you sure you want to release this person?", + "title": "Releasing?" + } + }, "deleteARR": { "deleteModal": { "btnCancel": "Cancel", diff --git a/src/modules/asyncButtons/i18n/en_GB.root.json b/src/modules/asyncButtons/i18n/en_GB.root.json index fcf96b36b3..8c147fbeab 100644 --- a/src/modules/asyncButtons/i18n/en_GB.root.json +++ b/src/modules/asyncButtons/i18n/en_GB.root.json @@ -2,6 +2,10 @@ "description": "Avoid with this module that the game is reloaded when you press certain buttons.", "name": "Asynchronous buttons", "settings": { + "buildingPersonal": { + "description": "Prevents reloading when you release personal.", + "title": "Release of personal" + }, "buildingTax": { "description": "Prevents recharging when you set the cost of own cells or hospital beds.", "title": "Cost absorption of cells and beds" diff --git a/src/modules/asyncButtons/i18n/en_US.json b/src/modules/asyncButtons/i18n/en_US.json index b33b893b9e..ea73879301 100644 --- a/src/modules/asyncButtons/i18n/en_US.json +++ b/src/modules/asyncButtons/i18n/en_US.json @@ -1,4 +1,12 @@ { + "buildingPersonal": { + "deleteModal": { + "btnCancel": "Cancel", + "btnConfirm": "Release", + "text": "Are you sure you want to release this person?", + "title": "Releasing?" + } + }, "deleteARR": { "deleteModal": { "btnCancel": "Cancel", diff --git a/src/modules/asyncButtons/i18n/en_US.root.json b/src/modules/asyncButtons/i18n/en_US.root.json index fcf96b36b3..8c147fbeab 100644 --- a/src/modules/asyncButtons/i18n/en_US.root.json +++ b/src/modules/asyncButtons/i18n/en_US.root.json @@ -2,6 +2,10 @@ "description": "Avoid with this module that the game is reloaded when you press certain buttons.", "name": "Asynchronous buttons", "settings": { + "buildingPersonal": { + "description": "Prevents reloading when you release personal.", + "title": "Release of personal" + }, "buildingTax": { "description": "Prevents recharging when you set the cost of own cells or hospital beds.", "title": "Cost absorption of cells and beds" diff --git a/src/modules/asyncButtons/main.ts b/src/modules/asyncButtons/main.ts index 48cbf1d56c..2141a38c1e 100644 --- a/src/modules/asyncButtons/main.ts +++ b/src/modules/asyncButtons/main.ts @@ -25,6 +25,17 @@ export default (async (LSSM, MODULE_ID, $m) => { ).default(LSSM, buildings, MODULE_ID); } + if ( + window.location.pathname.match(/^\/buildings\/\d+\/personals\/?$/) && + (await getSetting('buildingPersonal')) + ) { + ( + await import( + /* webpackChunkName: "modules/asyncButtons/buildingPersonal" */ './assets/buildingPersonal' + ) + ).default(LSSM, $m, MODULE_ID); + } + if ( window.location.pathname.match(/^\/missions\/\d+\/?$/) && missions.length diff --git a/src/modules/asyncButtons/register.json b/src/modules/asyncButtons/register.json index befed50f6c..0f0eac7686 100644 --- a/src/modules/asyncButtons/register.json +++ b/src/modules/asyncButtons/register.json @@ -1,5 +1,5 @@ { "dev": true, - "location": "(^/(buildings|missions|alliance_threads)/\\d+/?$)|(^/(verband/mitglieder|aaos)/?)", + "location": "(^/(buildings|missions|alliance_threads)/\\d+/?$)|(^/(verband/mitglieder|aaos)/?)|(^/buildings/\\d+/personals/?$)", "settings": true } \ No newline at end of file diff --git a/src/modules/asyncButtons/settings.ts b/src/modules/asyncButtons/settings.ts index 4a0628942c..1009061c5c 100644 --- a/src/modules/asyncButtons/settings.ts +++ b/src/modules/asyncButtons/settings.ts @@ -27,4 +27,8 @@ export default (() => ({ type: 'toggle', default: true, }, + buildingPersonal: { + type: 'toggle', + default: true, + }, })) as ModuleSettingFunction; From 8700b51fca767ad27a777798a3a8690699d68c8f Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 15 Jan 2021 10:52:13 +0000 Subject: [PATCH 18/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0115.1050=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../generalExtensions/i18n/de_DE.root.json | 98 +++++++++---------- src/modules/generalExtensions/main.ts | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 742df73fad..2508d85f45 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210115.0800", + "version": "4.1.11-pre1+20210115.1050", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/generalExtensions/i18n/de_DE.root.json b/src/modules/generalExtensions/i18n/de_DE.root.json index 60f22bd9aa..ff843f2af9 100644 --- a/src/modules/generalExtensions/i18n/de_DE.root.json +++ b/src/modules/generalExtensions/i18n/de_DE.root.json @@ -1,50 +1,50 @@ { - "description": "Ermöglicht dir allgemeine Verbesserungen, wie z.B klickbare Links im gesamten Spiel zu aktivieren.", - "name": "Allgemeine Verbesserungen", - "settings": { - "browserTitle": { - "description": "Passt den Titel des Browsertabs an, so dass da steht, was im Spiel gerade offen ist.", - "title": "Titel des Browsertabs" - }, - "clickableLinks": { - "description": "Links die in als reiner Text angezeigt werden (z.B. im Chat, Forum, Nachrichten, etc.) werden anklickbar gemacht. Sie öffnen sich automatisch in einem neuen Tab.", - "title": "Links anklickbar machen" - }, - "emojiPicker": { - "description": "Zeigt dir Emojis zur auswahl an, wenn du : gefolgt von Text eingibst.", - "title": "Emoji-Picker" - }, - "linkPreviews": { - "buildings": "Gebäude", - "description": "Zeigt eine kleine Infobox an, wenn du mit der Maus kurz über einem Link wartest. Du kannst hier einstellen, bei welchen Links die Infobox aktiviert sein soll:", - "missions": "Einsätze", - "profile": "Nutzer", - "title": "Link-Vorschau", - "vehicles": "Fahrzeuge" - }, - "mapUndo": { - "description": "Zentriere Karte auf Positionen, auf die vorher zentriert wurde. – Funktioniert aktuell nur beim Kartentyp \"OpenStreetMap\"", - "title": "Kartensprünge speichern" - }, - "ownMapMarkers": { - "description": "Speichere dir eigene Punkte auf der Karte ab, damit du sie schnell und mittels eines einzelnen Klicks verfügbar hast!", - "title": "Lesezeichen für die Karte" - }, - "saveLastBuildingType": { - "description": "Speichert im \"Gebäude Bauen\"-Menü, welchen Gebäude-Typ du zuletzt ausgewählt hattest und wählt diesen automatisch aus.", - "title": "Gebäude-Typ merken" - }, - "saveLastDispatchCenter": { - "description": "Speichert im \"Gebäude Bauen\"-Menü, welche Leitstelle du zuletzt ausgewählt hattest und wählt diese automatisch aus.", - "title": "Leitstelle merken" - }, - "showImg": { - "description": "Versuchen, eine Bildvorschau zu generieren. Funktioniert nur in Kombination mit \"Links anklickbar machen\"!", - "title": "Bildvorschau aktivieren" - }, - "extensionCloseCall": { - "description": "Schließt Ausbreitungssprechwünsche auch bei drücken des Buttons \"zum Einsatz\".", - "title": "Ausbreitung verbesserter FMS 5" - } - } -} + "description": "Ermöglicht dir allgemeine Verbesserungen, wie z.B klickbare Links im gesamten Spiel zu aktivieren.", + "name": "Allgemeine Verbesserungen", + "settings": { + "browserTitle": { + "description": "Passt den Titel des Browsertabs an, so dass da steht, was im Spiel gerade offen ist.", + "title": "Titel des Browsertabs" + }, + "clickableLinks": { + "description": "Links die in als reiner Text angezeigt werden (z.B. im Chat, Forum, Nachrichten, etc.) werden anklickbar gemacht. Sie öffnen sich automatisch in einem neuen Tab.", + "title": "Links anklickbar machen" + }, + "emojiPicker": { + "description": "Zeigt dir Emojis zur auswahl an, wenn du : gefolgt von Text eingibst.", + "title": "Emoji-Picker" + }, + "extensionCloseCall": { + "description": "Schließt Ausbreitungssprechwünsche auch bei drücken des Buttons \"zum Einsatz\".", + "title": "Ausbreitung verbesserter FMS 5" + }, + "linkPreviews": { + "buildings": "Gebäude", + "description": "Zeigt eine kleine Infobox an, wenn du mit der Maus kurz über einem Link wartest. Du kannst hier einstellen, bei welchen Links die Infobox aktiviert sein soll:", + "missions": "Einsätze", + "profile": "Nutzer", + "title": "Link-Vorschau", + "vehicles": "Fahrzeuge" + }, + "mapUndo": { + "description": "Zentriere Karte auf Positionen, auf die vorher zentriert wurde. – Funktioniert aktuell nur beim Kartentyp \"OpenStreetMap\"", + "title": "Kartensprünge speichern" + }, + "ownMapMarkers": { + "description": "Speichere dir eigene Punkte auf der Karte ab, damit du sie schnell und mittels eines einzelnen Klicks verfügbar hast!", + "title": "Lesezeichen für die Karte" + }, + "saveLastBuildingType": { + "description": "Speichert im \"Gebäude Bauen\"-Menü, welchen Gebäude-Typ du zuletzt ausgewählt hattest und wählt diesen automatisch aus.", + "title": "Gebäude-Typ merken" + }, + "saveLastDispatchCenter": { + "description": "Speichert im \"Gebäude Bauen\"-Menü, welche Leitstelle du zuletzt ausgewählt hattest und wählt diese automatisch aus.", + "title": "Leitstelle merken" + }, + "showImg": { + "description": "Versuchen, eine Bildvorschau zu generieren. Funktioniert nur in Kombination mit \"Links anklickbar machen\"!", + "title": "Bildvorschau aktivieren" + } + } +} \ No newline at end of file diff --git a/src/modules/generalExtensions/main.ts b/src/modules/generalExtensions/main.ts index da4dc1dc9b..7e787b0c76 100644 --- a/src/modules/generalExtensions/main.ts +++ b/src/modules/generalExtensions/main.ts @@ -119,7 +119,7 @@ export default (async (LSSM, MODULE_ID, $m) => { ) ).default( LSSM, - (t) => $m(`protocolDeletionConfirmation.${t}`), + t => $m(`protocolDeletionConfirmation.${t}`), !!(await getSetting('deleteSingleProtocolEntry')), MODULE_ID ); From 2ffe889920e3f4edef63ec337d66519dafeb15e5 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2021 11:40:45 +0100 Subject: [PATCH 19/73] =?UTF-8?q?=F0=9F=90=9B=20[eb/evl]=20custom=20type?= =?UTF-8?q?=20be=20an=20anchor=20too?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/extendedBuilding/assets/enhanceVehicleList.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/extendedBuilding/assets/enhanceVehicleList.ts b/src/modules/extendedBuilding/assets/enhanceVehicleList.ts index eda82299f3..2570b16aeb 100644 --- a/src/modules/extendedBuilding/assets/enhanceVehicleList.ts +++ b/src/modules/extendedBuilding/assets/enhanceVehicleList.ts @@ -145,7 +145,7 @@ export default async ( ]?.caption; typeWrapper.append(vehicleTypeNode); if (storedVehicle.vehicle_type_caption) { - const customTypeNode = document.createElement('button'); + const customTypeNode = document.createElement('a'); customTypeNode.classList.add( 'btn', 'btn-default', From 99d673a53573da888c55ad49b304b9470dac2f15 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2021 11:55:13 +0100 Subject: [PATCH 20/73] =?UTF-8?q?=F0=9F=90=9B=20[eb/blr]=20fix=20small=5Fb?= =?UTF-8?q?uildings=20not=20counting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/buildingsLeftRight.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/modules/extendedBuilding/assets/buildingsLeftRight.ts b/src/modules/extendedBuilding/assets/buildingsLeftRight.ts index 51f426829e..7581199805 100644 --- a/src/modules/extendedBuilding/assets/buildingsLeftRight.ts +++ b/src/modules/extendedBuilding/assets/buildingsLeftRight.ts @@ -8,11 +8,17 @@ export default (LSSM: Vue): void => { ({ id }) => id === buildingId ); if (!building) return; - const buildings = ( - (LSSM.$store.getters['api/buildingsByType'] as { - [type: number]: Building[]; - })[building.building_type] || [] - ) + const buildingsByType = LSSM.$store.getters['api/buildingsByType'] as { + [type: number]: Building[]; + }; + const small_building = + ((LSSM.$t('small_buildings') as unknown) as { [type: number]: number })[ + building.building_type + ] ?? (NaN as number); + const buildings = [ + ...(buildingsByType[building.building_type] || []), + ...(isNaN(small_building) ? [] : buildingsByType[small_building] || []), + ] .map(({ id }) => id) .sort(); const position = buildings.indexOf(buildingId); From 65577ec6c166ff4f6de215378ba53e8d973ce65c Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2021 14:39:49 +0100 Subject: [PATCH 21/73] =?UTF-8?q?=E2=9C=A8=20[ecl]=20vmps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleMissionParticipitationState.ts | 36 +++++++++++++++++++ src/modules/extendedCallList/main.ts | 8 +++++ src/modules/extendedCallList/register.json | 4 +-- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/modules/extendedCallList/assets/vehicleMissionParticipitationState.ts diff --git a/src/modules/extendedCallList/assets/vehicleMissionParticipitationState.ts b/src/modules/extendedCallList/assets/vehicleMissionParticipitationState.ts new file mode 100644 index 0000000000..89fc7a019c --- /dev/null +++ b/src/modules/extendedCallList/assets/vehicleMissionParticipitationState.ts @@ -0,0 +1,36 @@ +import { Vehicle } from 'typings/Vehicle'; + +export default async (LSSM: Vue, MODULE_ID: string): Promise => { + await LSSM.$store.dispatch('api/registerVehiclesUsage', { + feature: `${MODULE_ID}-vehicleMissionParticipitationState`, + }); + + const vehicles: Vehicle[] = LSSM.$store.state.api.vehicles; + const missions: number[] = []; + vehicles.forEach(({ target_type, target_id }) => { + if (target_type === 'mission' && target_id) missions.push(target_id); + }); + document + .querySelectorAll( + '#mission_own table tbody tr, #mission_alliance table tbody tr' + ) + .forEach(row => { + const span = document.createElement('span'); + span.classList.add( + 'glyphicon', + missions.includes( + parseInt( + row + .querySelector( + 'a[href^="/missions/"]' + ) + ?.getAttribute('href') + ?.replace(/.*?(?=\d+$)/, '') ?? '-1' + ) + ) + ? 'glyphicon-user' + : 'glyphicon-asterisk' + ); + row.firstElementChild?.append(span); + }); +}; diff --git a/src/modules/extendedCallList/main.ts b/src/modules/extendedCallList/main.ts index ec6fccd639..3be2265c55 100644 --- a/src/modules/extendedCallList/main.ts +++ b/src/modules/extendedCallList/main.ts @@ -8,6 +8,14 @@ export default (async (LSSM, MODULE_ID) => { }); }; + if (window.location.pathname.match(/^\/vehicles\/\d+\/?/)) { + return await ( + await import( + /* webpackChunkName: "modules/extendedCallList/vehicleMissionParticipitationState" */ './assets/vehicleMissionParticipitationState' + ) + ).default(LSSM, MODULE_ID); + } + if (await getSetting('remainingTime')) { ( await import( diff --git a/src/modules/extendedCallList/register.json b/src/modules/extendedCallList/register.json index ca1689d591..80b0653544 100644 --- a/src/modules/extendedCallList/register.json +++ b/src/modules/extendedCallList/register.json @@ -1,4 +1,4 @@ { - "location": "^/?$", + "location": "^(/vehicles/\\d+)/?$", "settings": true -} \ No newline at end of file +} From 33710014de387dd036cef9299dca0adc09bbe3c2 Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 16 Jan 2021 14:09:39 +0000 Subject: [PATCH 22/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0116.1407=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/extendedCallList/register.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2508d85f45..3afd5e674e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210115.1050", + "version": "4.1.11-pre1+20210116.1407", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/extendedCallList/register.json b/src/modules/extendedCallList/register.json index 80b0653544..f7417c8dd1 100644 --- a/src/modules/extendedCallList/register.json +++ b/src/modules/extendedCallList/register.json @@ -1,4 +1,4 @@ { "location": "^(/vehicles/\\d+)/?$", "settings": true -} +} \ No newline at end of file From ab1f83a40d840fdb4234bf4128bc254b2cfa3544 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 16 Jan 2021 19:51:53 +0100 Subject: [PATCH 23/73] =?UTF-8?q?=F0=9F=90=9B=20[ecw/gd]=20fix=20redBorder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/extendedCallWindow/assets/generationDate.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/extendedCallWindow/assets/generationDate.ts b/src/modules/extendedCallWindow/assets/generationDate.ts index c7ceba4524..a4b9ad60d2 100644 --- a/src/modules/extendedCallWindow/assets/generationDate.ts +++ b/src/modules/extendedCallWindow/assets/generationDate.ts @@ -28,9 +28,10 @@ export default (LSSM: Vue, yellowBorder: number, redBorder: boolean): void => { if (yellowBorder && moment().diff(generationDate, 'hours') >= yellowBorder) generationDateNode.style.border = 'yellow 1px solid'; - if ( - redBorder && - (generationDate.hours() <= 3 || generationDate.day() !== moment().day()) - ) + const nextDeletion = moment(); + if (moment().hours() > 3) nextDeletion.add(1, 'd'); + nextDeletion.hours(3).minutes(0); + + if (redBorder && generationDate.isBefore(nextDeletion.subtract(1, 'd'))) generationDateNode.style.border = 'red 1px solid'; }; From 4ba2ffe8d1160760887e79d7cc8a340e782f4da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 02:07:55 +0000 Subject: [PATCH 24/73] :arrow_up:(deps-dev): Bump @types/leaflet from 1.5.20 to 1.5.21 Bumps [@types/leaflet](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/leaflet) from 1.5.20 to 1.5.21. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/leaflet) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3afd5e674e..f8d829397c 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@types/combokeys": "^2.4.6", "@types/i18n-js": "^3.8.0", "@types/jquery": "^3.5.5", - "@types/leaflet": "^1.5.20", + "@types/leaflet": "^1.5.21", "@types/lodash": "^4.14.167", "@types/node": "^14.14.21", "@types/pdfmake": "^0.1.16", diff --git a/yarn.lock b/yarn.lock index 0e440ccc48..d9899762ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1041,10 +1041,10 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== -"@types/leaflet@^1.5.20": - version "1.5.20" - resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.5.20.tgz#b7a06a6c6a3f3ee06fb35cfa6e13194939883922" - integrity sha512-0H3F45Qb41ZLDjnichyrv9ts9KjijzN9acNt/i657jMcWFwHvZogBsBzBbUb3cwHyOxX/2qEMegacaHsXq23YA== +"@types/leaflet@^1.5.21": + version "1.5.21" + resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.5.21.tgz#994c44f2bfc45744120f01924c8973c5e960e051" + integrity sha512-b+BOkwJDq6DK4m+jFUOHNCFinIkO4CF1MjnOwYgZFX+oElpYpXCCIsxZ3+zQWIRSLVUbRXvaQq2K935jGIyp7A== dependencies: "@types/geojson" "*" From cdadfcae48313e8e578f4142063bfb2c10d40d1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 02:09:00 +0000 Subject: [PATCH 25/73] :arrow_up:(deps): Bump vue-i18n from 8.22.3 to 8.22.4 Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.22.3 to 8.22.4. - [Release notes](https://github.com/kazupon/vue-i18n/releases) - [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md) - [Commits](https://github.com/kazupon/vue-i18n/compare/v8.22.3...v8.22.4) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3afd5e674e..0634f27114 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "showdown": "^1.9.1", "ua-parser-js": "^0.7.23", "vue": "^2.6.12", - "vue-i18n": "^8.22.3", + "vue-i18n": "^8.22.4", "vue-js-modal": "2.0.0-rc.3", "vue-js-toggle-button": "^1.3.3", "vue-notification": "^1.3.20", diff --git a/yarn.lock b/yarn.lock index 0e440ccc48..d754b9dfc9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9459,10 +9459,10 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-i18n@^8.22.3: - version "8.22.3" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.22.3.tgz#4ac0fdc3e71d4fe188938c40a9ffca32cde60732" - integrity sha512-Vhyx7sZEmmW/aZLkzSlXei08Rv3hTondx4J9wbOjnThocTIK1QiXV6QRdT4BTnhT24JixDSf6kGkxqCXSaJ3Jw== +vue-i18n@^8.22.4: + version "8.22.4" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.22.4.tgz#255cbdab4ffa7337c5819b82dd171208af74e385" + integrity sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q== vue-js-modal@2.0.0-rc.3: version "2.0.0-rc.3" From 4312d4f0b2d4318fb4b2aeccfe11b064774a16e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 02:09:07 +0000 Subject: [PATCH 26/73] :arrow_up:(deps-dev): Bump eslint from 7.17.0 to 7.18.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.17.0 to 7.18.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.17.0...v7.18.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3afd5e674e..34946f3931 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "clean-webpack-plugin": "^3.0.0", "copy-dir": "^1.3.0", "css-loader": "^3.6.0", - "eslint": "^7.17.0", + "eslint": "^7.18.0", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.4.1", "html-loader": "^1.3.2", diff --git a/yarn.lock b/yarn.lock index 0e440ccc48..97e5dcca4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -868,10 +868,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@eslint/eslintrc@^0.2.2": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" - integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== +"@eslint/eslintrc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" + integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -880,7 +880,7 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.19" + lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -4019,13 +4019,13 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.17.0: - version "7.17.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" - integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== +eslint@^7.18.0: + version "7.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" + integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== dependencies: "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.2.2" + "@eslint/eslintrc" "^0.3.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -4049,7 +4049,7 @@ eslint@^7.17.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.19" + lodash "^4.17.20" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" From dfb3b9961a4578120469dd4fc7b85f462a640794 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 02:09:12 +0000 Subject: [PATCH 27/73] :arrow_up:(deps): Bump pdfmake from 0.1.69 to 0.1.70 Bumps [pdfmake](https://github.com/bpampuch/pdfmake) from 0.1.69 to 0.1.70. - [Release notes](https://github.com/bpampuch/pdfmake/releases) - [Changelog](https://github.com/bpampuch/pdfmake/blob/master/CHANGELOG.md) - [Commits](https://github.com/bpampuch/pdfmake/compare/0.1.69...0.1.70) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3afd5e674e..4d5122fd44 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "lodash": ">=4.17.19", "mini-svg-data-uri": "^1.2.3", "moment": "^2.29.1", - "pdfmake": "^0.1.69", + "pdfmake": "^0.1.70", "semver": "^7.3.4", "showdown": "^1.9.1", "ua-parser-js": "^0.7.23", diff --git a/yarn.lock b/yarn.lock index 0e440ccc48..c823b4b2dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7001,10 +7001,10 @@ pdfkit@>=0.8.1, pdfkit@^0.11.0: linebreak "^1.0.2" png-js "^1.0.0" -pdfmake@^0.1.69: - version "0.1.69" - resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.69.tgz#e4c6dcc9b058ab7a639061e295518a8fd196097d" - integrity sha512-XGMtTpbgEwXsa9DcuKhMowOPVJ+8cnGuJz7LV/bE5pnMmxBXAlMGgidQVyEfEUPFywCU2Y/4xibeX1vEm0hd7g== +pdfmake@^0.1.70: + version "0.1.70" + resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.1.70.tgz#b5102799deef264defa675dbb2dbf12ad49a9bae" + integrity sha512-xPhkblaQ71U97qhRTPj/1HknAHHFZ3cPRmRdrqEWD2xXBcEjEM3Yw0MIjML8DRy9Dt9n6QRjHVf662f0eLtd7Q== dependencies: iconv-lite "^0.6.2" linebreak "^1.0.2" From 786b05f91c7a5f443ff721224fcf16cba0cba8ab Mon Sep 17 00:00:00 2001 From: Build Server Date: Mon, 18 Jan 2021 05:59:30 +0000 Subject: [PATCH 28/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0118.0557=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4d5122fd44..97fa43310f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210116.1407", + "version": "4.1.11-pre1+20210118.0557", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 622df90164..1cc4ed8e1f 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -146,7 +146,7 @@ }, "pdfmake": { "url": "http://pdfmake.org", - "version": "0.1.69" + "version": "0.1.70" }, "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo-b6e1ef6e.svg", From 93fb6c496a94c98bba79a3254b46a9f1b850a4d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 02:07:50 +0000 Subject: [PATCH 29/73] :arrow_up:(deps-dev): Bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.13.0 to 4.14.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.14.0/packages/eslint-plugin) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 97fa43310f..972da3203c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@types/ua-parser-js": "^0.7.35", "@types/vue-select": "^2.5.1", "@types/webpack-env": "^1.16.0", - "@typescript-eslint/eslint-plugin": "^4.13.0", + "@typescript-eslint/eslint-plugin": "^4.14.0", "@typescript-eslint/parser": "^4.13.0", "@vuepress/plugin-active-header-links": "^1.8.0", "@vuepress/plugin-back-to-top": "^1.8.0", diff --git a/yarn.lock b/yarn.lock index c823b4b2dc..b4bb67b113 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1160,13 +1160,13 @@ "@types/webpack-sources" "*" source-map "^0.6.0" -"@typescript-eslint/eslint-plugin@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz#5f580ea520fa46442deb82c038460c3dd3524bb6" - integrity sha512-ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w== +"@typescript-eslint/eslint-plugin@^4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz#92db8e7c357ed7d69632d6843ca70b71be3a721d" + integrity sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww== dependencies: - "@typescript-eslint/experimental-utils" "4.13.0" - "@typescript-eslint/scope-manager" "4.13.0" + "@typescript-eslint/experimental-utils" "4.14.0" + "@typescript-eslint/scope-manager" "4.14.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" lodash "^4.17.15" @@ -1174,15 +1174,15 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz#9dc9ab375d65603b43d938a0786190a0c72be44e" - integrity sha512-/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw== +"@typescript-eslint/experimental-utils@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz#5aa7b006736634f588a69ee343ca959cd09988df" + integrity sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.13.0" - "@typescript-eslint/types" "4.13.0" - "@typescript-eslint/typescript-estree" "4.13.0" + "@typescript-eslint/scope-manager" "4.14.0" + "@typescript-eslint/types" "4.14.0" + "@typescript-eslint/typescript-estree" "4.14.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" @@ -1204,11 +1204,24 @@ "@typescript-eslint/types" "4.13.0" "@typescript-eslint/visitor-keys" "4.13.0" +"@typescript-eslint/scope-manager@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz#55a4743095d684e1f7b7180c4bac2a0a3727f517" + integrity sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q== + dependencies: + "@typescript-eslint/types" "4.14.0" + "@typescript-eslint/visitor-keys" "4.14.0" + "@typescript-eslint/types@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8" integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ== +"@typescript-eslint/types@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6" + integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A== + "@typescript-eslint/typescript-estree@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e" @@ -1223,6 +1236,20 @@ semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7" + integrity sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag== + dependencies: + "@typescript-eslint/types" "4.14.0" + "@typescript-eslint/visitor-keys" "4.14.0" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^7.3.2" + tsutils "^3.17.1" + "@typescript-eslint/visitor-keys@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe" @@ -1231,6 +1258,14 @@ "@typescript-eslint/types" "4.13.0" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54" + integrity sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA== + dependencies: + "@typescript-eslint/types" "4.14.0" + eslint-visitor-keys "^2.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040" From f6c9637d0389311424bb62cdffbb4548b8ac201e Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 19 Jan 2021 05:06:50 +0000 Subject: [PATCH 30/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0119.0504=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 139c56388e..cff09aaf24 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210118.0557", + "version": "4.1.11-pre1+20210119.0504", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 1cc4ed8e1f..8038dc9c1c 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -24,7 +24,7 @@ "version": "3.5.5" }, "@types/leaflet": { - "version": "1.5.20" + "version": "1.5.21" }, "@types/lodash": { "version": "4.14.167" From 47a78f802f6f16a623904567308c0f7a87ba8fce Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 19 Jan 2021 05:46:18 +0000 Subject: [PATCH 31/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0119.0544=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f58e1e44c5..fa30eded81 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210119.0504", + "version": "4.1.11-pre1+20210119.0544", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 8038dc9c1c..474f173c08 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -209,7 +209,7 @@ "vue-i18n": { "icon": "https://kazupon.github.io/vue-i18n/vue-i18n-logo.png", "url": "https://github.com/kazupon/vue-i18n#readme", - "version": "8.22.3" + "version": "8.22.4" }, "vue-js-modal": { "url": "http://vue-js-modal.yev.io/", From f537788b4efbcf31924fa63fc35851bf85407681 Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 19 Jan 2021 06:52:49 +0000 Subject: [PATCH 32/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0119.0650=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index be632ab2e2..1d1f958abf 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210119.0544", + "version": "4.1.11-pre1+20210119.0650", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 474f173c08..c7ecab1b5a 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -104,7 +104,7 @@ "eslint": { "icon": "https://eslint.org/assets/img/favicon.512x512.png", "url": "https://eslint.org", - "version": "7.17.0" + "version": "7.18.0" }, "eslint-plugin-prettier": { "icon": "https://prettier.io/icon.png", From c5a61e9e20b6ba63494cd89b45c54f4b6f49dbec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 07:27:26 +0000 Subject: [PATCH 33/73] :arrow_up:(deps-dev): Bump @types/lodash from 4.14.167 to 4.14.168 Bumps [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) from 4.14.167 to 4.14.168. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1d1f958abf..79f88f1f91 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/i18n-js": "^3.8.0", "@types/jquery": "^3.5.5", "@types/leaflet": "^1.5.21", - "@types/lodash": "^4.14.167", + "@types/lodash": "^4.14.168", "@types/node": "^14.14.21", "@types/pdfmake": "^0.1.16", "@types/semver": "^7.3.4", diff --git a/yarn.lock b/yarn.lock index 26fca9dee6..dc76585f77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1048,10 +1048,10 @@ dependencies: "@types/geojson" "*" -"@types/lodash@^4.14.167": - version "4.14.167" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.167.tgz#ce7d78553e3c886d4ea643c37ec7edc20f16765e" - integrity sha512-w7tQPjARrvdeBkX/Rwg95S592JwxqOjmms3zWQ0XZgSyxSLdzWaYH3vErBhdVS/lRBX7F8aBYcYJYTr5TMGOzw== +"@types/lodash@^4.14.168": + version "4.14.168" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" + integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== "@types/minimatch@*": version "3.0.3" From 0fb5feb3609d36f3e602cd2e81c2da56f7fca03d Mon Sep 17 00:00:00 2001 From: Build Server Date: Tue, 19 Jan 2021 10:27:18 +0000 Subject: [PATCH 34/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0119.1025=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6e136d725a..f0571a9d05 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210119.0650", + "version": "4.1.11-pre1+20210119.1025", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index c7ecab1b5a..426321d258 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -54,7 +54,7 @@ "version": "1.16.0" }, "@typescript-eslint/eslint-plugin": { - "version": "4.13.0" + "version": "4.14.0" }, "@typescript-eslint/parser": { "version": "4.13.0" From 6f2bceaf892226f51c8469588ec0b45546e58326 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 10:33:37 +0000 Subject: [PATCH 35/73] :arrow_up:(deps-dev): Bump @typescript-eslint/parser Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.13.0 to 4.14.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.14.0/packages/parser) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 51 ++++++++------------------------------------------- 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index f0571a9d05..4089913231 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@types/vue-select": "^2.5.1", "@types/webpack-env": "^1.16.0", "@typescript-eslint/eslint-plugin": "^4.14.0", - "@typescript-eslint/parser": "^4.13.0", + "@typescript-eslint/parser": "^4.14.0", "@vuepress/plugin-active-header-links": "^1.8.0", "@vuepress/plugin-back-to-top": "^1.8.0", "all-contributors-cli": "^6.19.0", diff --git a/yarn.lock b/yarn.lock index 0766344db3..123058f763 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1186,23 +1186,15 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.13.0.tgz#c413d640ea66120cfcc37f891e8cb3fd1c9d247d" - integrity sha512-KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg== - dependencies: - "@typescript-eslint/scope-manager" "4.13.0" - "@typescript-eslint/types" "4.13.0" - "@typescript-eslint/typescript-estree" "4.13.0" - debug "^4.1.1" - -"@typescript-eslint/scope-manager@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141" - integrity sha512-UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ== +"@typescript-eslint/parser@^4.14.0": + version "4.14.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.14.0.tgz#62d4cd2079d5c06683e9bfb200c758f292c4dee7" + integrity sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg== dependencies: - "@typescript-eslint/types" "4.13.0" - "@typescript-eslint/visitor-keys" "4.13.0" + "@typescript-eslint/scope-manager" "4.14.0" + "@typescript-eslint/types" "4.14.0" + "@typescript-eslint/typescript-estree" "4.14.0" + debug "^4.1.1" "@typescript-eslint/scope-manager@4.14.0": version "4.14.0" @@ -1212,30 +1204,11 @@ "@typescript-eslint/types" "4.14.0" "@typescript-eslint/visitor-keys" "4.14.0" -"@typescript-eslint/types@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8" - integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ== - "@typescript-eslint/types@4.14.0": version "4.14.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6" integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A== -"@typescript-eslint/typescript-estree@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e" - integrity sha512-9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg== - dependencies: - "@typescript-eslint/types" "4.13.0" - "@typescript-eslint/visitor-keys" "4.13.0" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.14.0": version "4.14.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7" @@ -1250,14 +1223,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.13.0": - version "4.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe" - integrity sha512-6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g== - dependencies: - "@typescript-eslint/types" "4.13.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.14.0": version "4.14.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54" From bf22de0be2091a6b7891f56f367ff94ed59e1031 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 02:03:37 +0000 Subject: [PATCH 36/73] :arrow_up:(deps-dev): Bump webpack-cli from 4.3.1 to 4.4.0 Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.3.1...webpack-cli@4.4.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 57 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index f0571a9d05..6548fd1cf3 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "vuepress-plugin-smooth-scroll": "^0.0.10", "vuepress-plugin-zooming": "^1.1.8", "webpack": "^4.46.0", - "webpack-cli": "^4.3.1", + "webpack-cli": "^4.4.0", "webpack-loader-append-prepend": "^1.0.2" }, "engines": { diff --git a/yarn.lock b/yarn.lock index 0766344db3..dd4df7fdc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1683,6 +1683,11 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" +"@webpack-cli/configtest@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.0.tgz#2aff5f1ebc6f793c13ba9b2a701d180eab17f5ee" + integrity sha512-Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw== + "@webpack-cli/info@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.1.tgz#af98311f983d0b9fce7284cfcf1acaf1e9f4879c" @@ -1690,10 +1695,10 @@ dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.1.tgz#7513d7a769e3f97958de799b5b49874425ae3396" - integrity sha512-Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw== +"@webpack-cli/serve@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.2.tgz#1f8eee44f96524756268f5e3f43e9d943f864d41" + integrity sha512-03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -2777,6 +2782,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + clone-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" @@ -8321,6 +8335,13 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + shallow-copy@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170" @@ -9708,14 +9729,15 @@ webpack-chain@^6.0.0: deepmerge "^1.5.2" javascript-stringify "^2.0.1" -webpack-cli@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.3.1.tgz#87a7873bc9c6a4708aa657759274b691e72a04a8" - integrity sha512-/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA== +webpack-cli@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.4.0.tgz#38c7fa01ea31510f5c490245dd1bb28018792f1b" + integrity sha512-/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ== dependencies: "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.0.0" "@webpack-cli/info" "^1.2.1" - "@webpack-cli/serve" "^1.2.1" + "@webpack-cli/serve" "^1.2.2" colorette "^1.2.1" commander "^6.2.0" enquirer "^2.3.6" @@ -9725,7 +9747,7 @@ webpack-cli@^4.3.1: interpret "^2.2.0" rechoir "^0.7.0" v8-compile-cache "^2.2.0" - webpack-merge "^4.2.2" + webpack-merge "^5.7.3" webpack-dev-middleware@^3.7.2: version "3.7.2" @@ -9790,13 +9812,21 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@^4.1.2, webpack-merge@^4.2.2: +webpack-merge@^4.1.2: version "4.2.2" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== dependencies: lodash "^4.17.15" +webpack-merge@^5.7.3: + version "5.7.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" + integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -9900,6 +9930,11 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" From ef62f051a66daebb0545d3bdecf48de8ae9d6da2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 03:28:26 +0000 Subject: [PATCH 37/73] :arrow_up:(deps-dev): Bump @types/node from 14.14.21 to 14.14.22 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.21 to 14.14.22. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f8ba197342..1ce2344529 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@types/jquery": "^3.5.5", "@types/leaflet": "^1.5.21", "@types/lodash": "^4.14.168", - "@types/node": "^14.14.21", + "@types/node": "^14.14.22", "@types/pdfmake": "^0.1.16", "@types/semver": "^7.3.4", "@types/showdown": "^1.9.3", diff --git a/yarn.lock b/yarn.lock index 6cdc72bca8..399b027cde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1058,10 +1058,10 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^14.14.21": - version "14.14.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e" - integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A== +"@types/node@*", "@types/node@^14.14.22": + version "14.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" + integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== "@types/pdfkit@*": version "0.10.6" From ef4fcb2cb84101370df3870845d53310b0d33aa5 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 20 Jan 2021 03:33:01 +0000 Subject: [PATCH 38/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0120.0329=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f8ba197342..12aa8528e1 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210119.1025", + "version": "4.1.11-pre1+20210120.0329", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 426321d258..b67b1cf493 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -27,7 +27,7 @@ "version": "1.5.21" }, "@types/lodash": { - "version": "4.14.167" + "version": "4.14.168" }, "@types/node": { "version": "14.14.21" From 3f13a5110abf5173fa25d39e04bcb6b323a5c60b Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 20 Jan 2021 08:13:08 +0000 Subject: [PATCH 39/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0120.0810=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0b0d3d604f..74dcc9ffe8 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210120.0329", + "version": "4.1.11-pre1+20210120.0810", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index b67b1cf493..ce5429b2e5 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -57,7 +57,7 @@ "version": "4.14.0" }, "@typescript-eslint/parser": { - "version": "4.13.0" + "version": "4.14.0" }, "@vuepress/plugin-active-header-links": { "icon": "https://vuepress.vuejs.org/hero.png", From 82e823a3ad940c6b411d664063cdf967036ea4f4 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 20 Jan 2021 08:29:41 +0000 Subject: [PATCH 40/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0120.0827=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e7c9402725..095ccac440 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210120.0810", + "version": "4.1.11-pre1+20210120.0827", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index ce5429b2e5..8fca6f6442 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -278,7 +278,7 @@ "webpack-cli": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", "url": "https://webpack.js.org/api/cli/", - "version": "4.3.1" + "version": "4.4.0" }, "webpack-loader-append-prepend": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From e1e0cdcfce2753f6c48d87b623f88f4c9a2f4ae8 Mon Sep 17 00:00:00 2001 From: Build Server Date: Wed, 20 Jan 2021 08:54:42 +0000 Subject: [PATCH 41/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0120.0852=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 109891c27b..062e6753cd 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210120.0827", + "version": "4.1.11-pre1+20210120.0852", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 8fca6f6442..0ebb4f6d24 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -30,7 +30,7 @@ "version": "4.14.168" }, "@types/node": { - "version": "14.14.21" + "version": "14.14.22" }, "@types/pdfmake": { "version": "0.1.16" From 5fba5b831f90d095a6fbc6c9fdda235b773c5afc Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 20 Jan 2021 17:11:20 +0100 Subject: [PATCH 42/73] =?UTF-8?q?=E2=9C=A8[mH]=20CriticalCare=20Add?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testing branch. Test ob noch alles geht wie es soll. NICHT FERTIG --- src/modules/missionHelper/i18n/en_GB.json | 2 ++ src/modules/missionHelper/i18n/en_GB.root.json | 10 ++++++---- src/modules/missionHelper/missionHelper.vue | 8 ++++++++ src/modules/missionHelper/settings.ts | 10 +++++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/modules/missionHelper/i18n/en_GB.json b/src/modules/missionHelper/i18n/en_GB.json index 7d4eb616b9..4f430dc12e 100644 --- a/src/modules/missionHelper/i18n/en_GB.json +++ b/src/modules/missionHelper/i18n/en_GB.json @@ -4,6 +4,8 @@ "followups": "Follow-up Mission | Follow-up Missions", "generated_by": "Generated by", "patients": { + "code_possible": "Possible Patient Codes", + "critical_care": "Critical Care Chance", "helicopter": "Probability for HEMS", "patient_allow_first_responder_chance": "First Responder Probability", "patient_at_end_of_mission": "The patient only appears at the end of the operation!", diff --git a/src/modules/missionHelper/i18n/en_GB.root.json b/src/modules/missionHelper/i18n/en_GB.root.json index e6018ac844..ed5f0af077 100644 --- a/src/modules/missionHelper/i18n/en_GB.root.json +++ b/src/modules/missionHelper/i18n/en_GB.root.json @@ -80,13 +80,15 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { + "patients": { "code_possible": { "description": "Shows possible patient codes", "title": "Details of possible patient codes" - } - }, - "patients": { + }, + "critical_care": { + "description": "Shows the possible Critical Care Chance", + "title": "Details of possible Critical Chances" + }, "content": { "description": "Shows details about possible patients.", "title": "Details of potential patients" diff --git a/src/modules/missionHelper/missionHelper.vue b/src/modules/missionHelper/missionHelper.vue index df398bf3a5..8db18b437c 100644 --- a/src/modules/missionHelper/missionHelper.vue +++ b/src/modules/missionHelper/missionHelper.vue @@ -167,6 +167,12 @@ ) +
  • + {{ $m('patients.critical_care') }} +
  • { }, ...(['en_GB', 'en_US', 'it_IT'].includes(locale) ? { - 'patient.code_possible': { + 'patients.code_possible': { type: 'toggle', default: false, }, } : null), + ...(['en_GB', 'nb_NO', 'da_DK'].includes(locale) + ? { + 'patients.critical_care': { + type: 'toggle', + default: false, + }, + } + : null), ...(locale !== 'nl_NL' ? { 'patients.patient_allow_first_responder_chance': { From 8670f429a87bc92ccd38048f95bb1e15472210d6 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 20 Jan 2021 17:39:49 +0100 Subject: [PATCH 43/73] =?UTF-8?q?=F0=9F=90=9B=20[mH]=20Fix=20=F0=9F=99=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/missionHelper/missionHelper.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/missionHelper/missionHelper.vue b/src/modules/missionHelper/missionHelper.vue index 8db18b437c..ea4cb1fd87 100644 --- a/src/modules/missionHelper/missionHelper.vue +++ b/src/modules/missionHelper/missionHelper.vue @@ -168,8 +168,8 @@ )
  • {{ $m('patients.critical_care') }}
    • From 2d92b07a1b66d01cb6adab92e92a384e79c260f7 Mon Sep 17 00:00:00 2001 From: Matt998998 <69791332+Matt998998@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:30:04 +0100 Subject: [PATCH 44/73] Create en_PL.root.json PL --- .../extendedBuilding/i18n/en_PL.root.json | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 src/modules/extendedBuilding/i18n/en_PL.root.json diff --git a/src/modules/extendedBuilding/i18n/en_PL.root.json b/src/modules/extendedBuilding/i18n/en_PL.root.json new file mode 100644 index 0000000000..f11a5ed26b --- /dev/null +++ b/src/modules/extendedBuilding/i18n/en_PL.root.json @@ -0,0 +1,62 @@ +{ + "description": "Dodaje przydatne funkcje do budynków.", + "name": "Rozszerzony widok budynku", + "settings": { + "buildingsLeftRight": { + "description": "Pokazuje w budynkach, ile innych budynków tego samego typu w danym kierunku.", + "title": "Liczba budynków tego samego typu" + }, + "enhanceVehicleList": { + "description": "Rozszerza listę pojazdów o przydatne funkcje - niektóre z nich można regulować.", + "title": "Rozszerz listę pojazdów" + }, + "enhancedPersonnelAssignment": { + "description": "Daje możliwość ukrycia personelu bez odpowiedniego przeszkolenia.", + "title": "Lepsza alokacja personelu" + }, + "expansions": { + "description": "Pokazuje rozszerzenia budynku bez konieczności wcześniejszego naciskania karty rozszerzeń.", + "title": "Pokaż rozszerzenia bezpośrednio" + }, + "fastDispatchChooser": { + "description": "Pozwala wybrać bezpośrednio w budynku, do którego centrum sterowania jest przypisane, bez konieczności wcześniejszego uzyskiwania dostępu do ustawień.", + "title": "Szybki wybór centrum sterowania" + }, + "fmsSwitch": { + "description": "Umożliwia przełączanie się między stanem 2 i 6, klikając stan.", + "title": "Szybka zmiana statusu 2 <=> 6 switch" + }, + "personnelAssignmentBtn": { + "description": "Wstawia obok przycisku 'Edytuj ', aby dodać przycisk do przydziału personelu. - Jeszcze nie działa w centrach kontroli!", + "title": "Przycisk przydziału personelu" + }, + "personnelDemands": { + "description": "Pokazuje, ile personelu jest wymagane przy minimalnym i maksymalnym obłożeniu pojazdu.", + "title": "Wymagania dotyczące personelu" + }, + "schoolingSummary": { + "description": "Pokazuje w przeglądzie personelu budynku, ile osób przeszło które szkolenie (a).", + "title": "Podsumowanie personelu" + }, + "vehicleTypes": { + "description": "Pokazuje typ pojazdu (i jeśli jest dostępna, własną klasę pojazdu) w oddzielnej kolumnie", + "title": "Typ pojazdu" + }, + "vehiclesPersonnelAssigned": { + "description": "Pokazuje, ile osób jest przypisanych do pojazdu.", + "title": "Przydzielona załoga" + }, + "vehiclesPersonnelColorized": { + "description": "Podświetla liczbę przydzielonych załóg na czerwono, jeśli jest mniejsza niż maksymalna możliwa, a na zielono, gdy maksymalna liczba zostanie osiągnięta.", + "title": "Kod koloru dla przydzielonej załogi" + }, + "vehiclesPersonnelCurrent": { + "description": "Pokazuje, ile osób aktualnie siedzi w pojeździe.", + "title": "Obecna załoga" + }, + "vehiclesPersonnelMax": { + "description": "Pokazuje maksymalną liczbę osób, które mogą się zmieścić w pojeździe.", + "title": "Maksymalna załoga" + } + } +} From e7b94a8be9167fd441024cf92db38bb1e04472f6 Mon Sep 17 00:00:00 2001 From: Matt998998 <69791332+Matt998998@users.noreply.github.com> Date: Wed, 20 Jan 2021 21:31:27 +0100 Subject: [PATCH 45/73] Rename en_PL.root.json to pl_PL.root.json --- .../extendedBuilding/i18n/{en_PL.root.json => pl_PL.root.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/modules/extendedBuilding/i18n/{en_PL.root.json => pl_PL.root.json} (100%) diff --git a/src/modules/extendedBuilding/i18n/en_PL.root.json b/src/modules/extendedBuilding/i18n/pl_PL.root.json similarity index 100% rename from src/modules/extendedBuilding/i18n/en_PL.root.json rename to src/modules/extendedBuilding/i18n/pl_PL.root.json From 306ae96b9dcce14b93b5e9988967e19a1aac3d83 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 20 Jan 2021 23:16:14 +0100 Subject: [PATCH 46/73] =?UTF-8?q?=F0=9F=90=9B=20[mH]=20add=20criticalcare?= =?UTF-8?q?=20to=20nb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and 🚨ESLINT --- src/modules/missionHelper/i18n/en_GB.root.json | 8 ++++---- src/modules/missionHelper/i18n/nb_NO.json | 1 + src/modules/missionHelper/i18n/nb_NO.root.json | 4 ++++ src/modules/missionHelper/missionHelper.vue | 4 +++- src/modules/missionHelper/settings.ts | 10 +++++----- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/modules/missionHelper/i18n/en_GB.root.json b/src/modules/missionHelper/i18n/en_GB.root.json index ed5f0af077..a999387b91 100644 --- a/src/modules/missionHelper/i18n/en_GB.root.json +++ b/src/modules/missionHelper/i18n/en_GB.root.json @@ -85,14 +85,14 @@ "description": "Shows possible patient codes", "title": "Details of possible patient codes" }, - "critical_care": { - "description": "Shows the possible Critical Care Chance", - "title": "Details of possible Critical Chances" - }, "content": { "description": "Shows details about possible patients.", "title": "Details of potential patients" }, + "critical_care": { + "description": "Shows the possible Critical Care Chance", + "title": "Details of possible Critical Chances" + }, "hideWhenNoNeed": { "description": "Hides the patient details if there are no more patients and patients do not appear until the end of the assignment.", "title": "Show patient details only when needed" diff --git a/src/modules/missionHelper/i18n/nb_NO.json b/src/modules/missionHelper/i18n/nb_NO.json index 1c3097d9d2..602cfbf936 100644 --- a/src/modules/missionHelper/i18n/nb_NO.json +++ b/src/modules/missionHelper/i18n/nb_NO.json @@ -5,6 +5,7 @@ "generated_by": "Generert av", "patients": { "allow_ktw_instead_of_rtw": "En syketransport kan bli brukt.", + "critical_care": "Sannsynlighet for at legevaktslege trengs", "helicopter": "Sannsynlighet for Luftambulanse:", "patient_allow_first_responder_chance": "sjanse for anmodning av First Responder.", "patient_at_end_of_mission": "NB: Pasienten dukker opp på slutten av oppdraget!", diff --git a/src/modules/missionHelper/i18n/nb_NO.root.json b/src/modules/missionHelper/i18n/nb_NO.root.json index 62bb6c7bdc..3ad4e5c565 100644 --- a/src/modules/missionHelper/i18n/nb_NO.root.json +++ b/src/modules/missionHelper/i18n/nb_NO.root.json @@ -100,6 +100,10 @@ "description": "Shows details about possible patients.", "title": "Details of potential patients" }, + "critical_care": { + "description": "Viser den mulige kritiske omsorgsmuligheten", + "title": "Detaljer om mulige kritiske sjanser" + }, "hideWhenNoNeed": { "description": "Hides the patient details if there are no more patients and patients do not appear until the end of the assignment.", "title": "Show patient details only when needed" diff --git a/src/modules/missionHelper/missionHelper.vue b/src/modules/missionHelper/missionHelper.vue index ea4cb1fd87..df53bc1079 100644 --- a/src/modules/missionHelper/missionHelper.vue +++ b/src/modules/missionHelper/missionHelper.vue @@ -169,7 +169,9 @@
  • {{ $m('patients.critical_care') }}
    • diff --git a/src/modules/missionHelper/settings.ts b/src/modules/missionHelper/settings.ts index 88ab991c00..dcaa77eb6a 100644 --- a/src/modules/missionHelper/settings.ts +++ b/src/modules/missionHelper/settings.ts @@ -173,11 +173,11 @@ export default ((MODULE_ID, LSSM, $m) => { : null), ...(['en_GB', 'nb_NO', 'da_DK'].includes(locale) ? { - 'patients.critical_care': { - type: 'toggle', - default: false, - }, - } + 'patients.critical_care': { + type: 'toggle', + default: false, + }, + } : null), ...(locale !== 'nl_NL' ? { From 2f6592a577b2a257162ce61da04cafc929760b24 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 20 Jan 2021 23:38:02 +0100 Subject: [PATCH 47/73] =?UTF-8?q?=F0=9F=94=A5[mH]=20remove=20some=20code?= =?UTF-8?q?=5Fpossible=20fromt=20some=20countrys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/missionHelper/i18n/en_AU.root.json | 6 ------ src/modules/missionHelper/i18n/fr_FR.root.json | 6 ------ src/modules/missionHelper/i18n/it_IT.root.json | 6 ++---- src/modules/missionHelper/i18n/nb_NO.root.json | 6 ------ src/modules/missionHelper/i18n/sv_SE.root.json | 6 ------ 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/modules/missionHelper/i18n/en_AU.root.json b/src/modules/missionHelper/i18n/en_AU.root.json index ea7ba7954f..5bf3a849d6 100644 --- a/src/modules/missionHelper/i18n/en_AU.root.json +++ b/src/modules/missionHelper/i18n/en_AU.root.json @@ -85,12 +85,6 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { - "code_possible": { - "description": "Shows possible patient codes", - "title": "Details of possible patient codes" - } - }, "patients": { "content": { "description": "Shows details about possible patients.", diff --git a/src/modules/missionHelper/i18n/fr_FR.root.json b/src/modules/missionHelper/i18n/fr_FR.root.json index 879ddf2d08..6cc567f5a0 100644 --- a/src/modules/missionHelper/i18n/fr_FR.root.json +++ b/src/modules/missionHelper/i18n/fr_FR.root.json @@ -85,12 +85,6 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { - "code_possible": { - "description": "Shows possible patient codes", - "title": "Details of possible patient codes" - } - }, "patients": { "content": { "description": "Affiche des détail sur les patients éventuels.", diff --git a/src/modules/missionHelper/i18n/it_IT.root.json b/src/modules/missionHelper/i18n/it_IT.root.json index 1d108d28cb..37e89ea4ab 100644 --- a/src/modules/missionHelper/i18n/it_IT.root.json +++ b/src/modules/missionHelper/i18n/it_IT.root.json @@ -71,13 +71,11 @@ "title": "Mostra Salvataggio Pesante / Motre di salvataggio invece dei camion VVF" } }, - "patient": { + "patients": { "code_possible": { "description": "Mostra i possibili codici dei pazienti", "title": "Dettagli sui possibili codici dei pazienti" - } - }, - "patients": { + }, "content": { "description": "Mostra i dettagli sui potenziali pazienti.", "title": "Dettagli sui potenziali pazienti" diff --git a/src/modules/missionHelper/i18n/nb_NO.root.json b/src/modules/missionHelper/i18n/nb_NO.root.json index 3ad4e5c565..7bf80334f9 100644 --- a/src/modules/missionHelper/i18n/nb_NO.root.json +++ b/src/modules/missionHelper/i18n/nb_NO.root.json @@ -89,12 +89,6 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { - "code_possible": { - "description": "Shows possible patient codes", - "title": "Details of possible patient codes" - } - }, "patients": { "content": { "description": "Shows details about possible patients.", diff --git a/src/modules/missionHelper/i18n/sv_SE.root.json b/src/modules/missionHelper/i18n/sv_SE.root.json index d5a0dffdb2..58cde1a353 100644 --- a/src/modules/missionHelper/i18n/sv_SE.root.json +++ b/src/modules/missionHelper/i18n/sv_SE.root.json @@ -67,12 +67,6 @@ "title": "Visa Lastväxlare / Räddningsbil istället för brandbilar" } }, - "patient": { - "code_possible": { - "description": "Shows possible patient codes", - "title": "Details of possible patient codes" - } - }, "patients": { "content": { "description": "Visar detaljer om möjliga patienter.", From f9d96a23a749e9221a34b2be398e27d233a88cad Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 20 Jan 2021 23:39:34 +0100 Subject: [PATCH 48/73] =?UTF-8?q?=F0=9F=94=A5[mH]=20ups.=20missing=20count?= =?UTF-8?q?ry=20remove?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/missionHelper/i18n/pl_PL.root.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/modules/missionHelper/i18n/pl_PL.root.json b/src/modules/missionHelper/i18n/pl_PL.root.json index 5160798e19..972b8c7bf7 100644 --- a/src/modules/missionHelper/i18n/pl_PL.root.json +++ b/src/modules/missionHelper/i18n/pl_PL.root.json @@ -86,12 +86,6 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { - "code_possible": { - "description": "Shows possible patient codes", - "title": "Details of possible patient codes" - } - }, "patients": { "content": { "description": "Shows details about possible patients.", From 3a16c99f12d8c1cf94b0e282796ec7e10cad3996 Mon Sep 17 00:00:00 2001 From: Ron31 Date: Wed, 20 Jan 2021 23:50:19 +0100 Subject: [PATCH 49/73] =?UTF-8?q?=F0=9F=90=9B=20[mH]=20checking=20critical?= =?UTF-8?q?=5Fcare=20setting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/missionHelper/missionHelper.vue | 5 ++++- src/modules/missionHelper/settings.ts | 1 + typings/modules/MissionHelper.d.ts | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/missionHelper/missionHelper.vue b/src/modules/missionHelper/missionHelper.vue index df53bc1079..369a5ac71a 100644 --- a/src/modules/missionHelper/missionHelper.vue +++ b/src/modules/missionHelper/missionHelper.vue @@ -168,7 +168,10 @@ )
  • { 'patients.code_possible': { type: 'toggle', default: false, + disabled: () => true, }, } : null), diff --git a/typings/modules/MissionHelper.d.ts b/typings/modules/MissionHelper.d.ts index d4738d6a8d..d061f1c234 100644 --- a/typings/modules/MissionHelper.d.ts +++ b/typings/modules/MissionHelper.d.ts @@ -60,6 +60,8 @@ export interface MissionHelper { patients: { title: boolean; content: boolean; + critical_care: boolean; + code_possible: boolean; live: boolean; hideWhenNoNeed: boolean; patient_allow_first_responder_chance: boolean; From d9e54f0dd0184fbd03296baa952e58c4aa64131e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jan 2021 02:08:34 +0000 Subject: [PATCH 50/73] :arrow_up:(deps-dev): Bump sass from 1.32.4 to 1.32.5 Bumps [sass](https://github.com/sass/dart-sass) from 1.32.4 to 1.32.5. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.32.4...1.32.5) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 062e6753cd..ccb7a5c08c 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.4.1", "html-loader": "^1.3.2", - "sass": "^1.32.4", + "sass": "^1.32.5", "sass-loader": "^10.1.1", "speed-measure-webpack-plugin": "^1.3.3", "string-replace-loader": "^2.3.0", diff --git a/yarn.lock b/yarn.lock index d06cd01085..e3382704dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8100,10 +8100,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.32.4: - version "1.32.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" - integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== +sass@^1.32.5: + version "1.32.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.5.tgz#2882d22ad5748c05fa9bff6c3b0ffbc4f4b9e1dc" + integrity sha512-kU1yJ5zUAmPxr7f3q0YXTAd1oZjSR1g3tYyv+xu0HZSl5JiNOaE987eiz7wCUvbm4I9fGWGU2TgApTtcP4GMNQ== dependencies: chokidar ">=2.0.0 <4.0.0" From 94c04ab0d16a2b5e59165c3a9f633aff39af0641 Mon Sep 17 00:00:00 2001 From: Build Server Date: Thu, 21 Jan 2021 07:17:44 +0000 Subject: [PATCH 51/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0121.0714=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ccb7a5c08c..53bc6daf49 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210120.0852", + "version": "4.1.11-pre1+20210121.0714", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 0ebb4f6d24..136c70a480 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -151,7 +151,7 @@ "sass": { "icon": "https://sass-lang.com/assets/img/logos/logo-b6e1ef6e.svg", "url": "https://github.com/sass/dart-sass", - "version": "1.32.4" + "version": "1.32.5" }, "sass-loader": { "icon": "https://webpack.js.org/assets/icon-square-big.svg", From 9e0e031e831a7a8c0f5567ca2566d5698d5d2c94 Mon Sep 17 00:00:00 2001 From: Matt998998 <69791332+Matt998998@users.noreply.github.com> Date: Fri, 22 Jan 2021 01:04:08 +0100 Subject: [PATCH 52/73] Create pl_PL.json PL --- src/modules/asyncButtons/i18n/pl_PL.json | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/modules/asyncButtons/i18n/pl_PL.json diff --git a/src/modules/asyncButtons/i18n/pl_PL.json b/src/modules/asyncButtons/i18n/pl_PL.json new file mode 100644 index 0000000000..45dd8e11d0 --- /dev/null +++ b/src/modules/asyncButtons/i18n/pl_PL.json @@ -0,0 +1,37 @@ +{ + "deleteARR": { + "deleteModal": { + "btnCancel": "anuluj", + "btnConfirm": "usuń", + "text": "Czy chcesz usunąć ten wpis (Zasad reagowania)", + "title": "Usunąć?" + } + }, + "forumPost": { + "deleteModal": { + "btnCancel": "anuluj", + "btnConfirm": "usuń", + "text": "Czy chcesz usunąć ten wpis?", + "title": "Usunąć?" + } + }, + "memberlistManageUser": { + "hide": "ukryj", + "kickModal": { + "btnCancel": "anuluj", + "btnConfirm": "Wyrzuć (Kick)", + "text": "Czy naprawdę chcesz wyrzucić gracza?", + "title": "Wyrzucić?" + }, + "set": "zestaw", + "unset": "usuń" + }, + "memberlistRoles": { + "admin": "Administrator sojuszu", + "aufsichtsrat": "Dziennik działań moderatora", + "coadmin": "Współadministrator sojuszu", + "finance": "Finanse sojuszu", + "schooling": "Szkoleniowy sojuszu", + "sprechwunsch_admin": "Żądanie transportu - Administrator" + } +} From 21ff7ff805ae562feb526d86baecb68793d1ac77 Mon Sep 17 00:00:00 2001 From: Matt998998 <69791332+Matt998998@users.noreply.github.com> Date: Fri, 22 Jan 2021 01:18:04 +0100 Subject: [PATCH 53/73] Create pl_PL.root.json pl --- src/modules/buildingHover/i18n/pl_PL.root.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/modules/buildingHover/i18n/pl_PL.root.json diff --git a/src/modules/buildingHover/i18n/pl_PL.root.json b/src/modules/buildingHover/i18n/pl_PL.root.json new file mode 100644 index 0000000000..6f2fb4c5c5 --- /dev/null +++ b/src/modules/buildingHover/i18n/pl_PL.root.json @@ -0,0 +1,4 @@ +{ + "description": "Pokazuje krótkie informacje o każdym budynku po najechaniu na niego myszą na mapie.", + "name": "Krótkie informacje o budynku" +} From daa6c26d219021bc3fe09c53125db725b27562b0 Mon Sep 17 00:00:00 2001 From: Matt998998 <69791332+Matt998998@users.noreply.github.com> Date: Fri, 22 Jan 2021 01:26:17 +0100 Subject: [PATCH 54/73] Create pl_PL.root.json PL --- src/modules/chatExtras/i18n/pl_PL.root.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/modules/chatExtras/i18n/pl_PL.root.json diff --git a/src/modules/chatExtras/i18n/pl_PL.root.json b/src/modules/chatExtras/i18n/pl_PL.root.json new file mode 100644 index 0000000000..037d4c4ab5 --- /dev/null +++ b/src/modules/chatExtras/i18n/pl_PL.root.json @@ -0,0 +1,14 @@ +{ + "description": "Rozszerza czat o kilka fajnych funkcji", + "name": "Rozszerzony czat", + "settings": { + "chatTime": { + "description": "Dostosowuje sygnaturę czasową do ustawionego formatu!", + "title": "Własny format sygnatury czasowej" + }, + "chatTimeFormat": { + "description": "Tutaj możesz wybrać żądany format. Możesz znaleźć pomoc here.", + "title": "Format daty i godziny" + } + } +} From 5c2b4f26676221e4d0eaa4317097a6ead3f05cc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Jan 2021 02:07:38 +0000 Subject: [PATCH 55/73] :arrow_up:(deps-dev): Bump eslint-plugin-vue from 7.4.1 to 7.5.0 Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 7.4.1 to 7.5.0. - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v7.4.1...v7.5.0) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 53bc6daf49..7da1b4c0d5 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "css-loader": "^3.6.0", "eslint": "^7.18.0", "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-vue": "^7.4.1", + "eslint-plugin-vue": "^7.5.0", "html-loader": "^1.3.2", "sass": "^1.32.5", "sass-loader": "^10.1.1", diff --git a/yarn.lock b/yarn.lock index e3382704dc..c066a30e4e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3990,15 +3990,15 @@ eslint-plugin-prettier@^3.3.1: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-vue@^7.4.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz#2526ef0c010c218824a89423dbe6ddbe76f04fd6" - integrity sha512-W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw== +eslint-plugin-vue@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz#cc6d983eb22781fa2440a7573cf39af439bb5725" + integrity sha512-QnMMTcyV8PLxBz7QQNAwISSEs6LYk2LJvGlxalXvpCtfKnqo7qcY0aZTIxPe8QOnHd7WCwiMZLOJzg6A03T0Gw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" semver "^7.3.2" - vue-eslint-parser "^7.3.0" + vue-eslint-parser "^7.4.1" eslint-scope@^4.0.3: version "4.0.3" @@ -9463,10 +9463,10 @@ vue-element-resize-detector@^1.0.6: dependencies: element-resize-detector "^1.2.1" -vue-eslint-parser@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" - integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw== +vue-eslint-parser@^7.4.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz#e4adcf7876a7379758d9056a72235af18a587f92" + integrity sha512-AFvhdxpFvliYq1xt/biNBslTHE/zbEvSnr1qfHA/KxRIpErmEDrQZlQnvEexednRHmLfDNOMuDYwZL5xkLzIXQ== dependencies: debug "^4.1.1" eslint-scope "^5.0.0" From 4372539252f89a5dd699b90de7151d094d8ab84b Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 22 Jan 2021 14:17:16 +0100 Subject: [PATCH 56/73] =?UTF-8?q?=F0=9F=8C=90[main,eCW,gE,mH]=20fix=20some?= =?UTF-8?q?thing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/cs_CZ.ts | 198 ++++++++---------- .../extendedCallWindow/i18n/cs_CZ.root.json | 28 +-- src/modules/extendedCallWindow/i18n/nl_NL.js | 1 + .../generalExtensions/i18n/en_AU.root.json | 4 + .../generalExtensions/i18n/en_GB.root.json | 4 + .../generalExtensions/i18n/en_US.root.json | 4 + .../generalExtensions/i18n/fr_FR.root.json | 4 + .../generalExtensions/i18n/it_IT.root.json | 4 + .../generalExtensions/i18n/nb_NO.root.json | 4 + .../generalExtensions/i18n/nl_NL.root.json | 4 + .../generalExtensions/i18n/sv_SE.root.json | 4 + .../missionHelper/i18n/en_US.root.json | 6 +- 12 files changed, 130 insertions(+), 135 deletions(-) diff --git a/src/i18n/cs_CZ.ts b/src/i18n/cs_CZ.ts index f786342c55..255887fead 100644 --- a/src/i18n/cs_CZ.ts +++ b/src/i18n/cs_CZ.ts @@ -107,7 +107,6 @@ export default { credits: 5_000, minPersonnel: 4, maxPersonnel: 6, - wtank: 0, }, 1: { caption: 'CAS 30', @@ -116,7 +115,6 @@ export default { credits: 5_000, minPersonnel: 1, maxPersonnel: 6, - wtank: 0, }, 2: { caption: 'AZ', @@ -125,7 +123,6 @@ export default { credits: 10_000, minPersonnel: 1, maxPersonnel: 2, - wtank: 0, special: 'Požadováno po vybudování 3 požárních stanic', }, 3: { @@ -135,7 +132,6 @@ export default { credits: 10_000, minPersonnel: 1, maxPersonnel: 1, - wtank: 0, special: 'Požadováno po vybudování 6 požárních stanic', }, 4: { @@ -145,7 +141,6 @@ export default { credits: 12_180, minPersonnel: 2, maxPersonnel: 3, - wtank: 0, special: 'Požadováno po vybudování 4 požárních stanic', }, 5: { @@ -155,7 +150,6 @@ export default { credits: 5_000, minPersonnel: 3, maxPersonnel: 3, - wtank: 0, }, 6: { caption: 'KHA', @@ -164,7 +158,6 @@ export default { credits: 17_300, minPersonnel: 1, maxPersonnel: 2, - wtank: 0, special: 'Požadováno po vybudování 7 požárních stanic', }, 7: { @@ -174,7 +167,6 @@ export default { credits: 19_200, minPersonnel: 1, maxPersonnel: 3, - wtank: 3_000, schooling: 'Požární stanice - Nebezpečné látky', shownSchooling: 'Nebezpečné látky', special: 'Požadováno po vybudování 11 požárních stanic', @@ -186,7 +178,6 @@ export default { credits: 5_000, minPersonnel: 2, maxPersonnel: 4, - wtank: 0, }, 9: { caption: 'Vrtulník LZS', @@ -195,7 +186,6 @@ export default { credits: 300_000, minPersonnel: 3, maxPersonnel: 5, - wtank: 0, }, 10: { caption: 'AP', @@ -204,7 +194,6 @@ export default { credits: 14_000, minPersonnel: 1, maxPersonnel: 2, - wtank: 0, }, 11: { caption: 'Policejní vrtulník', @@ -213,7 +202,6 @@ export default { credits: 300_000, minPersonnel: 1, maxPersonnel: 3, - wtank: 0, schooling: 'Policie - Kurz Letecké služby PČR', shownSchooling: 'Členové Letecké služby PČR', }, @@ -224,7 +212,6 @@ export default { credits: 10_000, minPersonnel: 6, maxPersonnel: 6, - wtank: 0, schooling: 'Policie - URNA', shownSchooling: 'URNA', special: 'Požadováno po vybudování 8 Obvodních oddělení Policie', @@ -236,7 +223,6 @@ export default { credits: 7_000, minPersonnel: 1, maxPersonnel: 2, - wtank: 0, schooling: 'Policie - Kynologové Policie', shownSchooling: 'Kynologové Policie', special: 'Požadováno po vybudování 6 Obvodních oddělení Policie', @@ -248,7 +234,6 @@ export default { credits: 2_500, minPersonnel: 1, maxPersonnel: 1, - wtank: 0, schooling: 'Policie - Policejní motocykl', shownSchooling: 'Strážník na motocyklu', }, @@ -259,7 +244,6 @@ export default { credits: 7_000, minPersonnel: 2, maxPersonnel: 4, - wtank: 0, schooling: 'Policie - URNA', shownSchooling: 'URNA', special: 'Požadováno po vybudování 8 Obvodních oddělení Policie', @@ -271,7 +255,6 @@ export default { credits: 11_680, minPersonnel: 1, maxPersonnel: 3, - wtank: 0, special: 'Požadováno po vybudování 5 požárních stanic', }, 17: { @@ -281,7 +264,6 @@ export default { credits: 25_500, minPersonnel: 1, maxPersonnel: 6, - wtank: 0, schooling: 'Požární stanice - MOS (mobilní operační středisko)', shownSchooling: 'MOS', special: 'Požadováno po vybudování 13 požárních stanic', @@ -293,7 +275,6 @@ export default { credits: 15_000, minPersonnel: 2, maxPersonnel: 3, - wtank: 0, schooling: 'Policie - vyšetřovatel DN', shownSchooling: 'Vyšetřovatel DN', }, @@ -304,15 +285,55 @@ export default { credits: 35_000, minPersonnel: 2, maxPersonnel: 3, - wtank: 0, schooling: 'Policie - Policejní pyrotechnik', shownSchooling: 'Policejní pyrotechnik', }, + 20: { + caption: 'Přívěs se člunem', + color: '#990000', + coins: 0, + credits: 0_000, + minPersonnel: 0, + maxPersonnel: 0, + special: 'Požadováno po vybudování 11 požárních stanic', + }, + 21: { + caption: 'Přívěs se člunem VZS ČČK', + color: '#990000', + coins: 12, + credits: 6_000, + minPersonnel: 0, + maxPersonnel: 0, + special: 'Je potřeba tažné vozidlo (SUV VZS ČČK, Dodávka VZS ČČK). Vyžaduje osoby(4) se speciálním vzděláním v oboru odtahové vozidlo', + }, + 22: { + caption: 'Potápěčský automobil', + color: '#990000', + coins: 0, + credits: 0_000, + minPersonnel: 0, + maxPersonnel: 0, + special: 'Požadováno po vybudování 11 požárních stanic', + }, + 23: { + caption: 'SUV VZS ČČK', + color: '#990000', + coins: 25, + credits: 10_000, + minPersonnel: 1, + maxPersonnel: 4, + }, + 24: { + caption: 'Dodávka VZS ČČK', + color: '#990000', + coins: 25, + credits: 10_000, + minPersonnel: 2, + maxPersonnel: 4, + }, }, - //here ends - - buildings: [ - { + buildings: { + 0: { caption: 'Fire station', color: '#bb0000', coins: 30, @@ -330,12 +351,6 @@ export default { coins: 20, duration: '7 Days', }, - { - caption: 'Forestry Expansion', - credits: 50_000, - coins: 13, - duration: '7 Days', - }, { caption: 'Water rescue expansion', credits: 100_000, @@ -352,7 +367,7 @@ export default { startVehicles: ['Type 1 fire engine', 'Type 2 fire engine'], maxBuildingsFunction: (): number => 4_000, }, - { + 1: { caption: 'Fire academy', color: '#992222', coins: 50, @@ -371,7 +386,7 @@ export default { startPersonnel: 0, startVehicles: [], }, - { + 2: { caption: 'Ambulance station', color: '#ffa500', coins: 35, @@ -384,7 +399,7 @@ export default { startPersonnel: 3, startVehicles: ['ALS Ambulance'], }, - { + 4: { caption: 'Hospital', color: '#bbe944', coins: 25, @@ -453,7 +468,7 @@ export default { startPersonnel: 0, startVehicles: [], }, - { + 5: { caption: 'Helicopter station', color: '#e7ad2f', coins: 50, @@ -471,7 +486,7 @@ export default { ? 4 : Math.floor(buildingsAmountTotal / 25), }, - { + 6: { caption: 'Police station', color: '#007700', coins: 35, @@ -493,7 +508,7 @@ export default { startVehicles: ['Patrol car'], maxBuildingsFunction: (): number => 1_500, }, - { + 7: { caption: 'Dispatch Center', color: '#24c3ae', coins: 0, @@ -508,7 +523,7 @@ export default { maxBuildingsFunction: (buildingsAmountTotal: number): number => Math.floor(buildingsAmountTotal / 25) + 1, }, - { + 8: { caption: 'Police academy', color: '#225522', coins: 50, @@ -527,7 +542,7 @@ export default { startPersonnel: 0, startVehicles: [], }, - { + 13: { caption: 'Police Aviation', color: '#148423', coins: 50, @@ -545,7 +560,7 @@ export default { ? 4 : Math.floor(buildingsAmountTotal / 25), }, - { + 14: { caption: 'Staging area', coins: 0, credits: 0, @@ -559,7 +574,20 @@ export default { startVehicles: [], maxBuildingsFunction: (): number => 4, }, - { + 15: { + caption: 'Vodní záchranná služba ČČK/Waterrescue', + color: '#ffa500', + coins: 35, + credits: 200_000, + extensions: [], + levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], + maxBuildings: 'No limit', + maxLevel: 39, + special: '', + startPersonnel: 3, + startVehicles: ['x'], + }, + 16: { caption: 'Prison Cells', coins: 'x', credits: 100_000, @@ -577,7 +605,7 @@ export default { startPersonnel: 0, startVehicles: [], }, - { + 18: { caption: 'Fire station (Small station) ', color: '#aa1111', coins: 25, @@ -597,7 +625,7 @@ export default { startVehicles: ['Type 1 fire engine', 'Type 2 fire engine'], maxBuildingsFunction: (): number => 4_000, }, - { + 19: { caption: 'Police station (Small station)', color: '#116611', coins: 25, @@ -617,7 +645,7 @@ export default { startVehicles: ['Patrol Car'], maxBuildingsFunction: (): number => 1_500, }, - { + 20: { caption: 'Ambulance station (Small station)', color: '#eeb611', coins: 25, @@ -635,28 +663,8 @@ export default { startPersonnel: 3, startVehicles: ['ALS Ambulance'], }, - { - caption: 'Clinic', - color: '#663300', - coins: 25, - credits: 100_000, - extensions: [ - { - caption: 'General Internal', - credits: 10_000, - coins: 10, - duration: '7 Days', - }, - ], - levelcost: ['1. 10.000', '2. 50.000', '3.-5. 100.000'], - maxBuildings: 'No limit', - maxLevel: 5, - special: '', - startPersonnel: 0, - startVehicles: ['Non. You can buy max. 2 Vehicles'], - }, - { - caption: 'Federal Police Station', + 21: { + caption: 'Pyrotechnická služba PČR', color: '#663300', coins: 50, credits: 5_000_000, @@ -668,46 +676,26 @@ export default { startPersonnel: 10, startVehicles: ['FBI Unit'], }, - { - caption: 'Rescue Boat Dock', - color: '#663300', - coins: 35, - credits: 500_000, - extensions: [], - levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: 'No limit', - maxLevel: 16, - special: '', - startPersonnel: 2, - startVehicles: [''], - }, - { - caption: 'Fire Boat Dock', - color: '#663300', - coins: 35, + 22: { + caption: 'Školící středisko VZS ČČK', + color: '#225522', + coins: 50, credits: 500_000, - extensions: [], - levelcost: ['1. 10.000', '2. 50.000', '3.-16. 100.000'], - maxBuildings: 'No limit', - maxLevel: 16, - special: '', - startPersonnel: 2, - startVehicles: [''], - }, - { - caption: 'Firefighting plane station', - color: '#663300', - coins: 65, - credits: 1_500_000, - extensions: [], - levelcost: ['1. 1.500.000'], + extensions: new Array(3).fill({ + caption: 'Additional classroom', + credits: 400_000, + coins: 40, + duration: '7 Days', + }), + levelcost: [], maxBuildings: 'No limit', - maxLevel: 2, - special: '', - startPersonnel: 2, - startVehicles: ['Water drop helicopter'], + maxLevel: 0, + special: + "Finance ministers and admins can (expand) association police schools with the help of credits from the association's treasury.Training course masters and admins can start training courses at association police schools.", + startPersonnel: 0, + startVehicles: [], }, - ], + }, buildingCategories: { 'Fire Department': { buildings: [0, 4, 11, 13, 17], @@ -763,9 +751,9 @@ export default { }, }, small_buildings: { - 0: 13, - 3: 16, - 5: 15, + 0: 18, + 2: 20, + 6: 19, }, vehicleBuildings: [0, 3, 5, 6, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18], cellBuildings: [5], diff --git a/src/modules/extendedCallWindow/i18n/cs_CZ.root.json b/src/modules/extendedCallWindow/i18n/cs_CZ.root.json index 1089fe4188..fff6866acc 100644 --- a/src/modules/extendedCallWindow/i18n/cs_CZ.root.json +++ b/src/modules/extendedCallWindow/i18n/cs_CZ.root.json @@ -126,20 +126,7 @@ 9, 12, 17, - 21, - 22, - 24, - 30, - 31, - 32, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41 + 21 ] }, { @@ -163,8 +150,7 @@ 16, 19, 23, - 26, - 47 + 26 ] }, { @@ -175,16 +161,6 @@ 24, 25 ] - }, - { - "name": "FBI", - "vehicleTypes": [ - 42, - 43, - 44, - 45, - 46 - ] } ] } diff --git a/src/modules/extendedCallWindow/i18n/nl_NL.js b/src/modules/extendedCallWindow/i18n/nl_NL.js index 53b9b54cb2..4317344e6e 100644 --- a/src/modules/extendedCallWindow/i18n/nl_NL.js +++ b/src/modules/extendedCallWindow/i18n/nl_NL.js @@ -34,6 +34,7 @@ module.exports = { elw2: 'Hoofdofficier van Dienst - Brandweer', elw3: 'Commandovoertuig of haakarmbak', dlk: 'Redvoertuig', + wasser_amount: 'Water (in Liters)', arff: 'Crashtender', elw_airport: 'Airport Fire Officer / On Scene Commander', rtw: 'Ambulance', diff --git a/src/modules/generalExtensions/i18n/en_AU.root.json b/src/modules/generalExtensions/i18n/en_AU.root.json index a62c11b750..5a9f14bd8c 100644 --- a/src/modules/generalExtensions/i18n/en_AU.root.json +++ b/src/modules/generalExtensions/i18n/en_AU.root.json @@ -14,6 +14,10 @@ "description": "Shows you emojis for selection when you type : followed by text.", "title": "Emoji picker" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Buildings", "description": "Shows a small info box when you wait with the mouse over a link for a short time. Here you can set for which links the infobox should be activated:", diff --git a/src/modules/generalExtensions/i18n/en_GB.root.json b/src/modules/generalExtensions/i18n/en_GB.root.json index a62c11b750..5a9f14bd8c 100644 --- a/src/modules/generalExtensions/i18n/en_GB.root.json +++ b/src/modules/generalExtensions/i18n/en_GB.root.json @@ -14,6 +14,10 @@ "description": "Shows you emojis for selection when you type : followed by text.", "title": "Emoji picker" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Buildings", "description": "Shows a small info box when you wait with the mouse over a link for a short time. Here you can set for which links the infobox should be activated:", diff --git a/src/modules/generalExtensions/i18n/en_US.root.json b/src/modules/generalExtensions/i18n/en_US.root.json index a62c11b750..5a9f14bd8c 100644 --- a/src/modules/generalExtensions/i18n/en_US.root.json +++ b/src/modules/generalExtensions/i18n/en_US.root.json @@ -14,6 +14,10 @@ "description": "Shows you emojis for selection when you type : followed by text.", "title": "Emoji picker" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Buildings", "description": "Shows a small info box when you wait with the mouse over a link for a short time. Here you can set for which links the infobox should be activated:", diff --git a/src/modules/generalExtensions/i18n/fr_FR.root.json b/src/modules/generalExtensions/i18n/fr_FR.root.json index aa09d947a7..d8e11a9b7d 100644 --- a/src/modules/generalExtensions/i18n/fr_FR.root.json +++ b/src/modules/generalExtensions/i18n/fr_FR.root.json @@ -14,6 +14,10 @@ "description": "Affiche une séléction d'émoji quand vous tapez : suivi d'un texte.", "title": "Émojis" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Bâtiments", "description": "Affiche une info-bulle au survol d'un lien. Choisissez ici pour quels lien les info-bulles sont actives :", diff --git a/src/modules/generalExtensions/i18n/it_IT.root.json b/src/modules/generalExtensions/i18n/it_IT.root.json index 686d1afb4e..5d8a5713df 100644 --- a/src/modules/generalExtensions/i18n/it_IT.root.json +++ b/src/modules/generalExtensions/i18n/it_IT.root.json @@ -14,6 +14,10 @@ "description": "Ti mostra le emoji per la selezione quando digiti : seguito da testo.", "title": "Selettore di emoji" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Edifici", "description": "Ti mostra un piccolo box di informazioni se ti fermi col mouse sopra un link per un breve periodo. Qui puoi impostare per quali link la finestra d'informazioni dovrebbe essere attivata:", diff --git a/src/modules/generalExtensions/i18n/nb_NO.root.json b/src/modules/generalExtensions/i18n/nb_NO.root.json index 583818c115..aa18441411 100644 --- a/src/modules/generalExtensions/i18n/nb_NO.root.json +++ b/src/modules/generalExtensions/i18n/nb_NO.root.json @@ -14,6 +14,10 @@ "description": "Shows you emojis for selection when you type : followed by text.", "title": "Emoji picker" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Buildings", "description": "Shows a small info box when you wait with the mouse over a link for a short time. Here you can set for which links the infobox should be activated:", diff --git a/src/modules/generalExtensions/i18n/nl_NL.root.json b/src/modules/generalExtensions/i18n/nl_NL.root.json index 4910268cef..5c69abfa59 100644 --- a/src/modules/generalExtensions/i18n/nl_NL.root.json +++ b/src/modules/generalExtensions/i18n/nl_NL.root.json @@ -14,6 +14,10 @@ "description": "Toont je emoji's die je kunt selecteren wanneer je typt : gevolgd door tekst.", "title": "Emoji-kiezer" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "buildings": "Gebouwen", "description": "Toont een klein informatievenster als u een korte tijd met de muis op een link wacht. Hier kunt u instellen voor welke links de infobox moet worden geactiveerd:", diff --git a/src/modules/generalExtensions/i18n/sv_SE.root.json b/src/modules/generalExtensions/i18n/sv_SE.root.json index 7dcf70cff8..bfa1109fc0 100644 --- a/src/modules/generalExtensions/i18n/sv_SE.root.json +++ b/src/modules/generalExtensions/i18n/sv_SE.root.json @@ -14,6 +14,10 @@ "description": "Visar dig emojis för val när du skriver: följt av text.", "title": "Emoji-picker" }, + "extensionCloseCall": { + "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", + "title": "Spreading improved FMS 5" + }, "linkPreviews": { "byggnader": "Byggnader", "description": "Visar en liten inforuta när du väntar med musen över en länk en kort stund. Här kan du ställa in för vilka länkar infoboxen ska aktiveras:", diff --git a/src/modules/missionHelper/i18n/en_US.root.json b/src/modules/missionHelper/i18n/en_US.root.json index c85c4ebf12..1a574b2136 100644 --- a/src/modules/missionHelper/i18n/en_US.root.json +++ b/src/modules/missionHelper/i18n/en_US.root.json @@ -98,13 +98,11 @@ "title": "Show Heavy Rescue / rescue engine instead of firetrucks" } }, - "patient": { + "patients": { "code_possible": { "description": "Shows possible patient codes", "title": "Details of possible patient codes" - } - }, - "patients": { + }, "content": { "description": "Shows details about possible patients.", "title": "Details of potential patients" From b50d854f5b67893f1f90f7e2bcbed2ea54413eed Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 22 Jan 2021 13:23:18 +0000 Subject: [PATCH 57/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0122.1320=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/i18n/cs_CZ.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 53bc6daf49..ac44ceaccb 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210121.0714", + "version": "4.1.11-pre1+20210122.1320", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/i18n/cs_CZ.ts b/src/i18n/cs_CZ.ts index 255887fead..a78b4427d6 100644 --- a/src/i18n/cs_CZ.ts +++ b/src/i18n/cs_CZ.ts @@ -304,7 +304,8 @@ export default { credits: 6_000, minPersonnel: 0, maxPersonnel: 0, - special: 'Je potřeba tažné vozidlo (SUV VZS ČČK, Dodávka VZS ČČK). Vyžaduje osoby(4) se speciálním vzděláním v oboru odtahové vozidlo', + special: + 'Je potřeba tažné vozidlo (SUV VZS ČČK, Dodávka VZS ČČK). Vyžaduje osoby(4) se speciálním vzděláním v oboru odtahové vozidlo', }, 22: { caption: 'Potápěčský automobil', From 8076422dae9aca658bc6283449ccd0b0eca73069 Mon Sep 17 00:00:00 2001 From: Build Server Date: Fri, 22 Jan 2021 17:58:32 +0000 Subject: [PATCH 58/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0122.1756=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/libraries.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3909127f50..9f8c5b52f9 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210122.1320", + "version": "4.1.11-pre1+20210122.1756", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/libraries.json b/src/libraries.json index 136c70a480..31007dbc34 100644 --- a/src/libraries.json +++ b/src/libraries.json @@ -114,7 +114,7 @@ "eslint-plugin-vue": { "icon": "https://vuejs.org/images/logo.png", "url": "https://eslint.vuejs.org", - "version": "7.4.1" + "version": "7.5.0" }, "highcharts": { "icon": "https://www.highcharts.com/images/ico/favicon-192x192.png", From cd6d8bbfc11e0fe142ebaf6c9ac5824b283510f6 Mon Sep 17 00:00:00 2001 From: Buschi314 <19466123+Buschi314@users.noreply.github.com> Date: Fri, 22 Jan 2021 21:43:49 +0100 Subject: [PATCH 59/73] Update de_DE.json --- src/modules/missionHelper/i18n/de_DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/missionHelper/i18n/de_DE.json b/src/modules/missionHelper/i18n/de_DE.json index 3e50c279a5..8b5e9806b3 100644 --- a/src/modules/missionHelper/i18n/de_DE.json +++ b/src/modules/missionHelper/i18n/de_DE.json @@ -9,6 +9,7 @@ "nef": "Wahrscheinlichkeit für einen Notarzt", "patient_allow_first_responder_chance": "First Responder Wahrscheinlichkeit", "patient_at_end_of_mission": "Der Patient tritt erst am Ende des Einsatzes auf! | Die Patienten treten erst am Ende des Einsatzes auf!", + "patient_other_treatment": "Wahrscheinlichkeit für Tragehilfe", "patient_transport": "Transportwahrscheinlichkeit", "possible_patient": "Patient maximal | Patienten maximal", "possible_patient_exact": "genau {n} Patient | genau {n} Patienten", @@ -130,4 +131,4 @@ }, "title": "Fahrzeuge" } -} \ No newline at end of file +} From 11b850e3373613937baddf37286f9397e6819b9e Mon Sep 17 00:00:00 2001 From: jan Date: Fri, 22 Jan 2021 22:05:35 +0100 Subject: [PATCH 60/73] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[static]=20improve?= =?UTF-8?q?=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/php_configs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/php_configs.php b/static/php_configs.php index 9315371886..433801a78b 100644 --- a/static/php_configs.php +++ b/static/php_configs.php @@ -1,2 +1,2 @@ Date: Fri, 22 Jan 2021 22:11:47 +0100 Subject: [PATCH 61/73] Update missionHelper.vue --- src/modules/missionHelper/missionHelper.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/missionHelper/missionHelper.vue b/src/modules/missionHelper/missionHelper.vue index 369a5ac71a..b2de17c7c0 100644 --- a/src/modules/missionHelper/missionHelper.vue +++ b/src/modules/missionHelper/missionHelper.vue @@ -190,6 +190,12 @@ > {{ $m('patients.helicopter') }}
    • +
  • + {{ $m('patients.patient_other_treatment') }} +
  • {{ $m('patients.patient_other_treatment') }}
    • From f99360f098e6c7857669b4143196bd121eb5d7cf Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 23 Jan 2021 14:39:15 +0000 Subject: [PATCH 64/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0123.1437=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/extendedBuilding/i18n/pl_PL.root.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 31b2f079de..05dfeca5eb 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210123.1425", + "version": "4.1.11-pre1+20210123.1437", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/extendedBuilding/i18n/pl_PL.root.json b/src/modules/extendedBuilding/i18n/pl_PL.root.json index f11a5ed26b..f04f26a3c1 100644 --- a/src/modules/extendedBuilding/i18n/pl_PL.root.json +++ b/src/modules/extendedBuilding/i18n/pl_PL.root.json @@ -59,4 +59,4 @@ "title": "Maksymalna załoga" } } -} +} \ No newline at end of file From 9251a2dffb48dc7b1410b7a0a1195cd6ea7c7a0d Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 23 Jan 2021 16:09:59 +0100 Subject: [PATCH 65/73] =?UTF-8?q?=F0=9F=90=9B=20fix/improve=20telemetry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/telemetry.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/static/telemetry.php b/static/telemetry.php index 0ed53a6abd..ed5a95dadd 100644 --- a/static/telemetry.php +++ b/static/telemetry.php @@ -25,12 +25,12 @@ $MYSQLI = new mysqli($db_url, $db_user, $db_pass, $db_name); if ($MYSQLI->connect_errno) { - http_response_code(505) && die(json_encode(['Failed to connect to MySQL!'])); + die(json_encode(['Failed to connect to MySQL!'])); } if ($USER == null) { if (!($insert = $MYSQLI->prepare('INSERT INTO `v4_user`(`id`, `game`, `uid`, `version`, `name`, `data`, `police`) VALUES (?, ?, ?, ?, ?, ?, ?)'))) { - http_response_code(501) && die(json_encode(['Preparing Statement failed!'])); + die(json_encode(['Preparing Statement failed!'])); } $insert->bind_param('ssisssi', $USER_KEY, $data['game'], $data['uid'], $data['version'], $data['name'], $data['data'], $data['police']); if (!$insert->execute()) { @@ -63,11 +63,12 @@ $result['success'] = true; } else { if (!($update = $MYSQLI->prepare('UPDATE `v4_user` SET `name`=?, `version`=?, `data`=?, `timestamp`=CURRENT_TIMESTAMP(), `police`=? WHERE `id`=?'))) { - http_response_code(503) && die(json_encode(['Preparing Statement failed!'])); + die(json_encode(['Preparing Statement failed!'])); } $update->bind_param('sssis', $data['name'], $data['version'], $data['data'], $data['police'], $USER_KEY); if (!$update->execute()) { - http_response_code(504) && die(json_encode(['Execute failed!'])); + die(json_encode($MYSQLI->error)); + die(json_encode(['Execute failed!'])); } $update->close(); $result['success'] = true; From 6454eb036cc76b5318d22e0337058b6916c90022 Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 23 Jan 2021 15:26:05 +0000 Subject: [PATCH 66/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0123.1524=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/asyncButtons/i18n/pl_PL.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 05dfeca5eb..d7722e090b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210123.1437", + "version": "4.1.11-pre1+20210123.1524", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/asyncButtons/i18n/pl_PL.json b/src/modules/asyncButtons/i18n/pl_PL.json index 45dd8e11d0..2aaf76418c 100644 --- a/src/modules/asyncButtons/i18n/pl_PL.json +++ b/src/modules/asyncButtons/i18n/pl_PL.json @@ -34,4 +34,4 @@ "schooling": "Szkoleniowy sojuszu", "sprechwunsch_admin": "Żądanie transportu - Administrator" } -} +} \ No newline at end of file From 59705e049594552b57567475ecefeac0b658de7e Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 23 Jan 2021 15:41:15 +0000 Subject: [PATCH 67/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0123.1539=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/buildingHover/i18n/pl_PL.root.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d7722e090b..8a0b6b1fbf 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210123.1524", + "version": "4.1.11-pre1+20210123.1539", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/buildingHover/i18n/pl_PL.root.json b/src/modules/buildingHover/i18n/pl_PL.root.json index 6f2fb4c5c5..ab66aa81b5 100644 --- a/src/modules/buildingHover/i18n/pl_PL.root.json +++ b/src/modules/buildingHover/i18n/pl_PL.root.json @@ -1,4 +1,4 @@ { "description": "Pokazuje krótkie informacje o każdym budynku po najechaniu na niego myszą na mapie.", "name": "Krótkie informacje o budynku" -} +} \ No newline at end of file From b28ae149d4261e955400d918c0df7494f64d8735 Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 23 Jan 2021 16:43:44 +0000 Subject: [PATCH 68/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11-pre1+2021?= =?UTF-8?q?0123.1641=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/modules/chatExtras/i18n/pl_PL.root.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8a0b6b1fbf..72d44e6d35 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210123.1539", + "version": "4.1.11-pre1+20210123.1641", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/src/modules/chatExtras/i18n/pl_PL.root.json b/src/modules/chatExtras/i18n/pl_PL.root.json index 037d4c4ab5..2e8bcbdbd5 100644 --- a/src/modules/chatExtras/i18n/pl_PL.root.json +++ b/src/modules/chatExtras/i18n/pl_PL.root.json @@ -11,4 +11,4 @@ "title": "Format daty i godziny" } } -} +} \ No newline at end of file From 51f8dc50fdb621d8fbcb10551b32c2a04b21ae19 Mon Sep 17 00:00:00 2001 From: JRH-1997 <65117490+JRH-1997@users.noreply.github.com> Date: Sat, 23 Jan 2021 17:47:45 +0100 Subject: [PATCH 69/73] :bug: missing nl_NL translations and missing/changed arrSpecs --- src/modules/asyncButtons/i18n/nl_NL.json | 8 ++++++++ src/modules/extendedCallWindow/i18n/nl_NL.js | 3 ++- src/modules/generalExtensions/i18n/nl_NL.root.json | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/modules/asyncButtons/i18n/nl_NL.json b/src/modules/asyncButtons/i18n/nl_NL.json index 0fbec6c228..4004988a41 100644 --- a/src/modules/asyncButtons/i18n/nl_NL.json +++ b/src/modules/asyncButtons/i18n/nl_NL.json @@ -1,4 +1,12 @@ { + "buildingPersonal": { + "deleteModal": { + "btnCancel": "Annuleren", + "btnConfirm": "Verwijderen", + "text": "Wil je deze persoon verwijderen?", + "title": "Verwijderen?" + } + }, "deleteARR": { "deleteModal": { "btnCancel": "Annuleren", diff --git a/src/modules/extendedCallWindow/i18n/nl_NL.js b/src/modules/extendedCallWindow/i18n/nl_NL.js index 4317344e6e..a0d6034242 100644 --- a/src/modules/extendedCallWindow/i18n/nl_NL.js +++ b/src/modules/extendedCallWindow/i18n/nl_NL.js @@ -47,7 +47,8 @@ module.exports = { ambulance_or_rapid_responder: 'Ambulance of Rapid Responder', kdow_orgl_any: 'OVD-G of OVDG-RR', fly_car_any: 'OVDG-RR of Rapid Responder', - rw: 'Hulpverleningsvoertuig', + rw_only: 'Hulpverleningsvoertuig', + rw: 'HV of TS-HV', gwl2wasser: 'Slangenwagen / Watertankwagen of Watertransportsysteem-haakarmbak', gwl2wasser_only: 'Alleen Slangenwagen / Watertankwagen', diff --git a/src/modules/generalExtensions/i18n/nl_NL.root.json b/src/modules/generalExtensions/i18n/nl_NL.root.json index 5c69abfa59..d40f776d7a 100644 --- a/src/modules/generalExtensions/i18n/nl_NL.root.json +++ b/src/modules/generalExtensions/i18n/nl_NL.root.json @@ -15,8 +15,8 @@ "title": "Emoji-kiezer" }, "extensionCloseCall": { - "description": "Closes propagation speech requests even if the button \"to mission\" is pressed.", - "title": "Spreading improved FMS 5" + "description": "Sluit de uitbreidingsspraakaanvraag ook bij het indrukken van de knop \"Naar incident\".", + "title": "Uitbreiding verbeterde status 7" }, "linkPreviews": { "buildings": "Gebouwen", From 9524eabcdf970b733f25bbac10203d4c6d688d93 Mon Sep 17 00:00:00 2001 From: JRH-1997 <65117490+JRH-1997@users.noreply.github.com> Date: Sat, 23 Jan 2021 17:51:38 +0100 Subject: [PATCH 70/73] :globe_with_meridians: another missing translation --- src/modules/asyncButtons/i18n/nl_NL.root.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/asyncButtons/i18n/nl_NL.root.json b/src/modules/asyncButtons/i18n/nl_NL.root.json index 5eb8149fbc..03a037c2dd 100644 --- a/src/modules/asyncButtons/i18n/nl_NL.root.json +++ b/src/modules/asyncButtons/i18n/nl_NL.root.json @@ -2,6 +2,10 @@ "description": "Voorkom met deze module dat het venster opnieuw wordt geladen als je op bepaalde knoppen drukt.", "name": "Niet herladen", "settings": { + "buildingPersonal": { + "description": "Voorkomt herladen wanneer u een personeelslid verwijdert", + "title": "Personeel verwijderen" + }, "buildingTax": { "description": "Voorkomt herladen wanneer u de kosten van eigen cellen of ziekenhuisbedden instelt.", "title": "Kosten van cellen en bedden" From 19fb7384a8d9deae3e6d3539e6ef2bab49555fbe Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 23 Jan 2021 18:08:36 +0100 Subject: [PATCH 71/73] =?UTF-8?q?=F0=9F=94=96=204.1.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72d44e6d35..66a987cb23 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11-pre1+20210123.1641", + "version": "4.1.11+20210123.1641", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", From 9b08472761fb87fc681539f1ade7715a37d0a8a5 Mon Sep 17 00:00:00 2001 From: Build Server Date: Sat, 23 Jan 2021 17:32:59 +0000 Subject: [PATCH 72/73] =?UTF-8?q?=F0=9F=93=A6=20Version=204.1.11+20210123.?= =?UTF-8?q?1723=20[tc-push]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- static/lssm-v4.user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 66a987cb23..90c3564611 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.1.11+20210123.1641", + "version": "4.1.11+20210123.1723", "license": "CC-BY-NC-SA-4.0", "scripts": { "predev": "tsc -b scripts && node scripts predev", diff --git a/static/lssm-v4.user.js b/static/lssm-v4.user.js index 7cb91364c9..ca6637db7b 100644 --- a/static/lssm-v4.user.js +++ b/static/lssm-v4.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name LSS-Manager V.4 -// @version 4.1.11-pre1+CZ-DK-DE-AU-GB-US-ES-MX-FI-FR-IT-JP-KR-NO-NL-PL-BR-PT-RO-RU-SK-SE-TR-UA +// @version 4.1.11+CZ-DK-DE-AU-GB-US-ES-MX-FI-FR-IT-JP-KR-NO-NL-PL-BR-PT-RO-RU-SK-SE-TR-UA // @author Aisaka | Sanni | Jan (jxn_30) | Ron31 // @description Das Tool für das LSS in der Version 4 // @include /^https?:\/\/(?:w{3}\.)?(?:(policie\.)?operacni-stredisko\.cz|(politi\.)?alarmcentral-spil\.dk|(polizei\.)?leitstellenspiel\.de|(?:(police\.)?missionchief-australia|(police\.)?missionchief|(poliisi\.)?hatakeskuspeli|missionchief-japan|missionchief-korea|(politiet\.)?nodsentralspillet|(politie\.)?meldkamerspel|operador193|(policia\.)?jogo-operador112|jocdispecerat112|dispecerske-centrum|112-merkez|dyspetcher101-game)\.com|(police\.)?missionchief\.co\.uk|centro-de-mando\.es|centro-de-mando\.mx|(police\.)?operateur112\.fr|(polizia\.)?operatore112\.it|(policja\.)?operatorratunkowy\.pl|dispetcher112\.ru|(polis\.)?larmcentralen-spelet\.se)\/.*$/ From 93592cc2543ede56e2bff5d0169f83e0c1aaa918 Mon Sep 17 00:00:00 2001 From: jan Date: Sat, 23 Jan 2021 18:44:00 +0100 Subject: [PATCH 73/73] =?UTF-8?q?=F0=9F=9A=A8=20[ge/ecc]=20fix=20lint=20wa?= =?UTF-8?q?rning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generalExtensions/assets/extensionCloseCall.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/generalExtensions/assets/extensionCloseCall.ts b/src/modules/generalExtensions/assets/extensionCloseCall.ts index 7707507d1e..1b21cf7d17 100644 --- a/src/modules/generalExtensions/assets/extensionCloseCall.ts +++ b/src/modules/generalExtensions/assets/extensionCloseCall.ts @@ -1,16 +1,18 @@ export default (): void => { const listenerTarget = document.getElementById('radio_messages_important'); if (!listenerTarget) return; - listenerTarget.addEventListener('click', handleListen); - function handleListen(event: { target: any }) { - const clickedBtn = event.target; + listenerTarget.addEventListener('click', event => { + const clickedBtn = event.target as HTMLElement | null; - if (clickedBtn.nextElementSibling.hasAttribute('vehicle_id')) { + if ( + clickedBtn && + clickedBtn.nextElementSibling?.hasAttribute('vehicle_id') + ) { clickedBtn.classList.add('radio_message_close'); clickedBtn.setAttribute( 'vehicle_id', - clickedBtn.nextElementSibling.getAttribute('vehicle_id') + clickedBtn.nextElementSibling?.getAttribute('vehicle_id') ?? '0' ); } - } + }); };