From 314fa18bdcdab25147d4df3ca3ed754888188e3f Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Thu, 4 Nov 2021 00:19:04 +0100 Subject: [PATCH 01/53] Fix #871 --- src/components/notifications/Telegram.vue | 32 +++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue index 3fe287eee..0fa4dd55e 100644 --- a/src/components/notifications/Telegram.vue +++ b/src/components/notifications/Telegram.vue @@ -25,13 +25,7 @@

- - - + {{ telegramGetUpdatesURL() }}

@@ -40,49 +34,47 @@ From ba46fb6b1c126838eae55ed6b5a87de937e00ed7 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Wed, 10 Nov 2021 09:11:19 +0100 Subject: [PATCH 02/53] Clickable URL --- src/components/notifications/Telegram.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue index 0fa4dd55e..55ff7ec45 100644 --- a/src/components/notifications/Telegram.vue +++ b/src/components/notifications/Telegram.vue @@ -25,7 +25,7 @@

- {{ telegramGetUpdatesURL() }} + {{ telegramGetUpdatesURL() }}

From 5d836cf05dac7b763becd07ed76e5c818b4d741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Wed, 10 Nov 2021 10:09:21 +0100 Subject: [PATCH 03/53] [empty commit] pull request for updating translatables From 2c85491ee011ca7f7ba655592eb292b2aa5733c7 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:52:22 +0100 Subject: [PATCH 04/53] Replace body and header placeholder functions with translations --- src/languages/en.js | 2 ++ src/pages/EditMonitor.vue | 18 ++---------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 15c3cd0f3..37c1dd693 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -307,4 +307,6 @@ export default { steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", "Current User": "Current User", recent: "Recent", + headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", + bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", }; diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 65c3dad6e..332a98106 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -257,13 +257,13 @@
- +
- +
@@ -339,20 +339,6 @@ export default { return this.$root.baseURL + "/api/push/" + this.monitor.pushToken + "?msg=OK&ping="; }, - bodyPlaceholder() { - return `Example: -{ - "key": "value" -}`; - }, - - headersPlaceholder() { - return `Example: -{ - "HeaderName": "HeaderValue" -}`; - } - }, watch: { From 267654c987490d66bace688955badb156516649f Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:53:38 +0100 Subject: [PATCH 05/53] Replace hard-coded names for groups in Status page with translations --- src/languages/en.js | 3 +++ src/pages/StatusPage.vue | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 37c1dd693..273ece35e 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -309,4 +309,7 @@ export default { recent: "Recent", headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", + // Status page + "Untitled Group": "Untitled Group", + "Services": "Services", }; diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index ce0f94b55..82e46a748 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -468,10 +468,10 @@ export default { }, addGroup() { - let groupName = "Untitled Group"; + let groupName = this.$t("Untitled Group"); if (this.$root.publicGroupList.length === 0) { - groupName = "Services"; + groupName = this.$t("Services"); } this.$root.publicGroupList.push({ From 265cca9ed1db2cbbacf2dc4781407fb1e50a614a Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 10:54:09 +0100 Subject: [PATCH 06/53] Replace "Default" notification badge with translation --- src/languages/en.js | 1 + src/pages/EditMonitor.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index 273ece35e..6f1a6b5f4 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -307,6 +307,7 @@ export default { steamApiKeyDescription: "For monitoring a Steam Game Server you need a Steam Web-API key. You can register your API key here: ", "Current User": "Current User", recent: "Recent", + Default: "Default", headersPlaceholder: "Example:\n\{\n \"HeaderName\": \"HeaderValue\"\n}", bodyPlaceholder: "Example:\n\{\n \"key\": \"value\"\n}", // Status page diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 332a98106..907ecfa6b 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -215,7 +215,7 @@ {{ $t("Edit") }} - Default + {{ $t("Default") }} From 28f530394e69e1c5cea4382b2b9b74fc147daca9 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 11:12:48 +0100 Subject: [PATCH 10/53] Add missing translation lookup for ClickSendSMS --- src/components/notifications/ClickSendSMS.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/notifications/ClickSendSMS.vue b/src/components/notifications/ClickSendSMS.vue index 2aed4184b..4fbb2f414 100644 --- a/src/components/notifications/ClickSendSMS.vue +++ b/src/components/notifications/ClickSendSMS.vue @@ -3,7 +3,7 @@
{{ $t("apiCredentials") }} - here + {{ $t("here") }}
From 4cc433166e6f3efc2419db2af628912328bf2293 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 11 Nov 2021 11:14:21 +0100 Subject: [PATCH 11/53] Add missing translation for SMTP security option --- src/components/notifications/SMTP.vue | 2 +- src/languages/en.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/notifications/SMTP.vue b/src/components/notifications/SMTP.vue index 483917e3f..ab660abed 100644 --- a/src/components/notifications/SMTP.vue +++ b/src/components/notifications/SMTP.vue @@ -10,7 +10,7 @@
- + + +
- +
@@ -352,6 +352,20 @@ export default { return this.$root.baseURL + "/api/push/" + this.monitor.pushToken + "?msg=OK&ping="; }, + bodyPlaceholder() { + return `Example: +{ + "key": "value" +}`; + }, + + headersPlaceholder() { + return `Example: +{ + "HeaderName": "HeaderValue" +}`; + } + }, watch: { From c1b118a0f6325cf05ea252a921f3d09a775fdeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Mon, 29 Nov 2021 12:49:08 +0100 Subject: [PATCH 34/53] Use existing Example translation for HTTP headers and body placeholders --- src/pages/EditMonitor.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index 2678a94af..4a0d0408b 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -353,17 +353,17 @@ export default { }, bodyPlaceholder() { - return `Example: + return this.$t("Example:", [` { "key": "value" -}`; +}`]); }, headersPlaceholder() { - return `Example: + return this.$t("Example:", [` { "HeaderName": "HeaderValue" -}`; +}`]); } }, From baae4b5a5e19132981de5ace878cd2c1869cca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Mon, 29 Nov 2021 12:49:38 +0100 Subject: [PATCH 35/53] Remove unused translation keys from hr-HR --- src/languages/hr-HR.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js index 8d23f003b..129403fa2 100644 --- a/src/languages/hr-HR.js +++ b/src/languages/hr-HR.js @@ -316,8 +316,6 @@ export default { "Pick Accepted Status Codes...": "Odaberite HTTP statusne kodove koji će biti prihvaćeni...", "Steam API Key": "Steam API ključ", Default: "Zadano", - headersPlaceholder: "Primjer:\n{\n \"NazivZaglavlja\": \"VrijednostZaglavlja\"\n}", - bodyPlaceholder: "Primjer:\n{\n \"ključ\": \"vrijednost\"\n}", "HTTP Options": "HTTP Postavke", "Create Incident": "Novi izvještaj o incidentu", Title: "Naslov", From 4dd60cba3d312cc3cb960e7f504c88c777f59a62 Mon Sep 17 00:00:00 2001 From: tgcentral <2584395+tgcentral@users.noreply.github.com> Date: Wed, 1 Dec 2021 09:43:58 +0000 Subject: [PATCH 36/53] Typo correction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9177cc998..4fd0ff0cf 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Browse to http://localhost:3001 after starting. ### Advanced Installation -If you need more options or need to browse via a reserve proxy, please read: +If you need more options or need to browse via a reverse proxy, please read: https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install From 4b3fae53d42cc2465c5d573a81032cfe81fcffb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Csaba?= Date: Wed, 1 Dec 2021 15:32:39 +0100 Subject: [PATCH 37/53] HU language typo --- src/languages/hu.js | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/languages/hu.js b/src/languages/hu.js index 47ac72d64..37c9c6fd6 100644 --- a/src/languages/hu.js +++ b/src/languages/hu.js @@ -2,26 +2,26 @@ export default { languageName: "Magyar", checkEverySecond: "Ellenőrzés {0} másodpercenként", retryCheckEverySecond: "Újrapróbál {0} másodpercenként.", - retriesDescription: "Maximális próbálkozás mielőtt a szolgáltatás leállt jelőlést kap és értesítés kerül kiküldésre", - ignoreTLSError: "TLS/SSL hibák figyelnen kívül hagyása HTTPS weboldalaknál", + retriesDescription: "Maximális próbálkozás mielőtt a szolgáltatás 'Leállt' jelölést kap és értesítés kerül kiküldésre", + ignoreTLSError: "TLS/SSL hibák figyelmen kívül hagyása HTTPS weboldalaknál", upsideDownModeDescription: "Az állapot megfordítása. Ha a szolgáltatás elérhető, akkor lesz leállt állapotú.", maxRedirectDescription: "Az átirányítások maximális száma. állítsa 0-ra az átirányítás tiltásához.", acceptedStatusCodesDescription: "Válassza ki az állapot kódokat amelyek sikeres válasznak fognak számítani.", passwordNotMatchMsg: "A megismételt jelszó nem egyezik.", notificationDescription: "Kérem, rendeljen egy értesítést a figyeléshez, hogy működjön.", - keywordDescription: "Kulcsszó keresése a html-ben vagy a JSON válaszban. (kis-nagybetű érzékeny)", + keywordDescription: "Kulcsszó keresése a HTML-ben vagy a JSON válaszban. (kis-nagybetű érzékeny)", pauseDashboardHome: "Szünetel", deleteMonitorMsg: "Biztos, hogy törölni akarja ezt a figyelőt?", deleteNotificationMsg: "Biztos, hogy törölni akarja ezt az értesítést az összes figyelőnél?", resoverserverDescription: "A Cloudflare az alapértelmezett szerver, bármikor meg tudja változtatni a resolver server-t.", - rrtypeDescription: "Válassza ki az RR-Típust a figyelőhöz", + rrtypeDescription: "Válassza ki az RR-típust a figyelőhöz", pauseMonitorMsg: "Biztos, hogy szüneteltetni akarja?", enableDefaultNotificationDescription: "Minden új figyelőhöz ez az értesítés engedélyezett lesz alapértelmezetten. Kikapcsolhatja az értesítést külön minden figyelőnél.", clearEventsMsg: "Biztos, hogy törölni akar miden eseményt ennél a figyelnél?", - clearHeartbeatsMsg: "Biztos, hogy törölni akar minden heartbeat-et ennél a figyelőnél?", - confirmClearStatisticsMsg: "Biztos, hogy törölni akat MINDEN statisztikát?", + clearHeartbeatsMsg: "Biztos, hogy törölni akar minden életjelet ennél a figyelőnél?", + confirmClearStatisticsMsg: "Biztos, hogy törölni akar MINDEN statisztikát?", importHandleDescription: "Válassza a 'Meglévő kihagyását', ha ki szeretné hagyni az azonos nevő figyelőket vagy értesítésket. A 'Felülírás' törölni fog minden meglévő figyelőt és értesítést.", - confirmImportMsg: "Biztos, hogy importálja a mentést? Győzödjön meg róla, hogy jól választotta ki az importálás opciót.", + confirmImportMsg: "Biztos, hogy importálja a mentést? Győződjön meg róla, hogy jól választotta ki az importálás opciót.", twoFAVerifyLabel: "Kérem, adja meg a token-t, hogy a 2FA működését ellenőrizzük", tokenValidSettingsMsg: "A token érvényes! El tudja menteni a 2FA beállításait.", confirmEnableTwoFAMsg: "Biztosan engedélyezi a 2FA-t?", @@ -68,9 +68,9 @@ export default { URL: "URL", Hostname: "Hostnév", Port: "Port", - "Heartbeat Interval": "Heartbeat időköz", + "Heartbeat Interval": "Életjel időköz", Retries: "Újrapróbálkozás", - "Heartbeat Retry Interval": "Heartbeat újrapróbálkozások időköze", + "Heartbeat Retry Interval": "Életjel újrapróbálkozások időköze", Advanced: "Haladó", "Upside Down Mode": "Fordított mód", "Max. Redirects": "Max. átirányítás", @@ -82,8 +82,8 @@ export default { Light: "Világos", Dark: "Sötét", Auto: "Auto", - "Theme - Heartbeat Bar": "Téma - Heartbeat Bar", - Normal: "Normal", + "Theme - Heartbeat Bar": "Téma - Életjel sáv", + Normal: "Normál", Bottom: "Nyomógomb", None: "Nincs", Timezone: "Időzóna", @@ -97,9 +97,9 @@ export default { "Update Password": "Jelszó módosítása", "Disable Auth": "Hitelesítés tiltása", "Enable Auth": "Hitelesítés engedélyezése", - Logout: "Kijelenetkezés", + Logout: "Kijelentkezés", Leave: "Elhagy", - "I understand, please disable": "Megértettem, kérem tilsa le", + "I understand, please disable": "Megértettem, kérem tiltsa le", Confirm: "Megerősítés", Yes: "Igen", No: "Nem", @@ -129,8 +129,8 @@ export default { Create: "Létrehozás", "Clear Data": "Adatok törlése", Events: "Események", - Heartbeats: "Heartbeats", - "Auto Get": "Auto Get", + Heartbeats: "Életjelek", + "Auto Get": "Auto lekérd.", backupDescription: "Ki tudja menteni az összes figyelőt és értesítést egy JSON fájlba.", backupDescription2: "Ui.: Történeti és esemény adatokat nem tartalmaz.", backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyelmesen őrizze!", @@ -144,17 +144,17 @@ export default { "Verify Token": "Token ellenőrzése", "Setup 2FA": "2FA beállítása", "Enable 2FA": "2FA engedélyezése", - "Disable 2FA": "2FA toltása", + "Disable 2FA": "2FA tiltása", "2FA Settings": "2FA beállítások", - "Two Factor Authentication": "Two Factor Authentication", + "Two Factor Authentication": "Kétfaktoros hitelesítés", Active: "Aktív", Inactive: "Inaktív", Token: "Token", "Show URI": "URI megmutatása", - Tags: "Cimkék", + Tags: "Címkék", "Add New below or Select...": "Adjon hozzá lentre vagy válasszon...", - "Tag with this name already exist.": "Ilyen nevű cimke már létezik.", - "Tag with this value already exist.": "Ilyen értékű cimke már létezik.", + "Tag with this name already exist.": "Ilyen nevű címke már létezik.", + "Tag with this value already exist.": "Ilyen értékű címke már létezik.", color: "szín", "value (optional)": "érték (opcionális)", Gray: "Szürke", @@ -169,15 +169,15 @@ export default { "Avg. Ping": "Átl. ping", "Avg. Response": "Átl. válasz", "Entry Page": "Nyitólap", - statusPageNothing: "Semmi nincs itt, kérem, adjon hozzá egy figyelőt.", + statusPageNothing: "Semmi nincs itt. Adjon hozzá egy vagy több figyelőt.", "No Services": "Nincs szolgáltatás", "All Systems Operational": "Minden rendszer működik", "Partially Degraded Service": "Részlegesen leállt szolgáltatás", "Degraded Service": "Leállt szolgáltatás", "Add Group": "Csoport hozzáadása", "Add a monitor": "Figyelő hozzáadása", - "Edit Status Page": "Sátusz oldal szerkesztése", - "Go to Dashboard": "Menj az irányítópulthoz", + "Edit Status Page": "Státusz oldal szerkesztése", + "Go to Dashboard": "Irányítópulthoz", telegram: "Telegram", webhook: "Webhook", smtp: "Email (SMTP)", @@ -192,9 +192,9 @@ export default { octopush: "Octopush", promosms: "PromoSMS", lunasea: "LunaSea", - apprise: "Apprise (Support 50+ Notification services)", + apprise: "Apprise (50+ értesítési szolgáltatás)", pushbullet: "Pushbullet", line: "Line Messenger", mattermost: "Mattermost", - "Status Page": "Status Page", + "Status Page": "Státusz oldal", }; From c36190bba6562e861276e46efff41cd6136e1dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Csaba?= Date: Wed, 1 Dec 2021 15:40:22 +0100 Subject: [PATCH 38/53] Node engine version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fdc690f75..801348266 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/louislam/uptime-kuma.git" }, "engines": { - "node": "14.*" + "node": "14.* >=16.*" }, "scripts": { "install-legacy": "npm install --legacy-peer-deps", @@ -130,4 +130,4 @@ "typescript": "~4.4.4", "vite": "~2.6.14" } -} +} \ No newline at end of file From 67849a9e843cbe61d5727b5585ee6b2a5c7e053e Mon Sep 17 00:00:00 2001 From: Jonas Liebert Date: Thu, 2 Dec 2021 08:53:45 +0100 Subject: [PATCH 39/53] add support for stackfield notifications --- server/notification-providers/stackfield.js | 41 +++++++++++++++++++++ server/notification.js | 2 + src/components/notifications/Stackfield.vue | 13 +++++++ src/components/notifications/index.js | 2 + src/languages/en.js | 1 + 5 files changed, 59 insertions(+) create mode 100644 server/notification-providers/stackfield.js create mode 100644 src/components/notifications/Stackfield.vue diff --git a/server/notification-providers/stackfield.js b/server/notification-providers/stackfield.js new file mode 100644 index 000000000..7f22634e3 --- /dev/null +++ b/server/notification-providers/stackfield.js @@ -0,0 +1,41 @@ +const NotificationProvider = require("./notification-provider"); +const axios = require("axios"); +const { setting } = require("../util-server"); +const { getMonitorRelativeURL } = require("../../src/util"); + +class Stackfield extends NotificationProvider { + + name = "stackfield"; + + async send(notification, msg, monitorJSON = null) { + let okMsg = "Sent Successfully."; + try { + // Stackfield message formatting: https://www.stackfield.com/help/formatting-messages-2001 + + let textMsg = "+Uptime Kuma Alert+"; + + if (monitorJSON && monitorJSON.name) { + textMsg += `\n*${monitorJSON.name}*`; + } + + textMsg += `\n${msg}`; + + const baseURL = await setting("primaryBaseURL"); + if (baseURL) { + textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`; + } + + const data = { + "Title": textMsg, + }; + + await axios.post(notification.stackfieldwebhookURL, data); + return okMsg; + } catch (error) { + this.throwGeneralAxiosError(error); + } + + } +} + +module.exports = Stackfield; diff --git a/server/notification.js b/server/notification.js index e2cfb193d..3eb5f97bf 100644 --- a/server/notification.js +++ b/server/notification.js @@ -24,6 +24,7 @@ const AliyunSms = require("./notification-providers/aliyun-sms"); const DingDing = require("./notification-providers/dingding"); const Bark = require("./notification-providers/bark"); const SerwerSMS = require("./notification-providers/serwersms"); +const Stackfield = require("./notification-providers/stackfield"); class Notification { @@ -60,6 +61,7 @@ class Notification { new Webhook(), new Bark(), new SerwerSMS(), + new Stackfield(), ]; for (let item of list) { diff --git a/src/components/notifications/Stackfield.vue b/src/components/notifications/Stackfield.vue new file mode 100644 index 000000000..c8dfb72b2 --- /dev/null +++ b/src/components/notifications/Stackfield.vue @@ -0,0 +1,13 @@ + diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js index bb71fba09..155a1ab26 100644 --- a/src/components/notifications/index.js +++ b/src/components/notifications/index.js @@ -23,6 +23,7 @@ import AliyunSMS from "./AliyunSms.vue"; import DingDing from "./DingDing.vue"; import Bark from "./Bark.vue"; import SerwerSMS from "./SerwerSMS.vue"; +import Stackfield from './Stackfield.vue'; /** * Manage all notification form. @@ -55,6 +56,7 @@ const NotificationFormList = { "DingDing": DingDing, "Bark": Bark, "serwersms": SerwerSMS, + "stackfield": Stackfield, } export default NotificationFormList diff --git a/src/languages/en.js b/src/languages/en.js index a51469c04..fee80a760 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -351,4 +351,5 @@ export default { serwersmsAPIPassword: "API Password", serwersmsPhoneNumber: "Phone number", serwersmsSenderName: "SMS Sender Name (registered via customer portal)", + "stackfield": "Stackfield", }; From f33d55c92dfabf64487e9f1410bc315e450a81db Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Thu, 2 Dec 2021 11:09:27 +0100 Subject: [PATCH 40/53] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4fd0ff0cf..ecd33bcba 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Try it! https://demo.uptime.kuma.pet -It is a temporary live demo, all data will be deleted after 10 minutes. The server is located at Tokyo, so if you live far from there it may affect your experience. I suggest that you should install and try it out for the best demo experience. +It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience. VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much! @@ -120,7 +120,7 @@ If you love this project, please consider giving me a ⭐. ### Issues Page -You can discuss or ask for help in [Issues](https://github.com/louislam/uptime-kuma/issues). +You can discuss or ask for help in [issues](https://github.com/louislam/uptime-kuma/issues). ### Subreddit @@ -132,8 +132,8 @@ https://www.reddit.com/r/UptimeKuma/ If you want to report a bug or request a new feature. Free feel to open a [new issue](https://github.com/louislam/uptime-kuma/issues). -If you want to translate Uptime Kuma into your langauge, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages +If you want to translate Uptime Kuma into your language, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages If you want to modify Uptime Kuma, this guideline may be useful for you: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md -English proofreading is needed too because my grammar is not that great sadly. Feel free to correct my grammar in this readme, source code, or wiki. +English proofreading is needed too because my grammar is not that great, sadly. Feel free to correct my grammar in this README, source code, or wiki. From e17ef02008f58d2f3074f84ec434cba114cd896f Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Thu, 2 Dec 2021 11:15:14 +0100 Subject: [PATCH 41/53] Update CONTRIBUTING.md --- CONTRIBUTING.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46e9a8990..3679bbd9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ First of all, thank you everyone who made pull requests for Uptime Kuma, I never thought GitHub Community can be that nice! And also because of this, I also never thought other people actually read my code and edit my code. It is not structured and commented so well, lol. Sorry about that. -The project was created with vite.js (vue3). Then I created a sub-directory called "server" for server part. Both frontend and backend share the same package.json. +The project was created with vite.js (vue3). Then I created a subdirectory called "server" for server part. Both frontend and backend share the same package.json. The frontend code build into "dist" directory. The server (express.js) exposes the "dist" directory as root of the endpoint. This is how production is working. @@ -27,11 +27,10 @@ The frontend code build into "dist" directory. The server (express.js) exposes t ## Can I create a pull request for Uptime Kuma? -Generally, if the pull request is working fine and it do not affect any existing logic, workflow and performance, I will merge into the master branch once it is tested. +Generally, if the pull request is working fine, and it does not affect any existing logic, workflow and performance, I will merge into the master branch once it is tested. If you are not sure whether I will accept your pull request, feel free to create an empty pull request draft first. - ### Recommended Pull Request Guideline 1. Fork the project @@ -41,7 +40,7 @@ If you are not sure whether I will accept your pull request, feel free to create `git commit -m "[empty commit] pull request for " --allow-empty` 1. Push to your fork repo 1. Create a pull request: https://github.com/louislam/uptime-kuma/compare -1. Write a proper description +1. Write a proper description 1. Click "Change to draft" ### Pull Request Examples @@ -66,7 +65,7 @@ I do not have such knowledge to test it. #### ⚠ Low Priority - Harsh Mode -Some pull requests are required to modify the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also you may need to write a lot of unit tests to ensure that there is no breaking change. +Some pull requests are required to modify the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also, you may need to write a lot of unit tests to ensure that there is no breaking change. - Touch large parts of code of any very important features - Touch monitoring logic @@ -74,7 +73,6 @@ Some pull requests are required to modify the core. To be honest, I do not want - Touch the entry point of Docker or Node.js - Modify auth - #### *️⃣ Low Priority It changed my current workflow and require further studies. @@ -143,7 +141,7 @@ express.js is just used for serving the frontend built files (index.html, .js an - modules/ (Modified 3rd-party modules) - notification-providers/ (individual notification logic) - routers/ (Express Routers) -- scoket-handler (Socket.io Handlers) +- socket-handler (Socket.io Handlers) - server.js (Server main logic) ## How to start the Frontend Dev Server @@ -201,7 +199,7 @@ ncu -u -t patch npm install ``` -Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only. +Since previously updating Vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only. Patch release = the third digit ([Semantic Versioning](https://semver.org/)) @@ -209,20 +207,19 @@ Patch release = the third digit ([Semantic Versioning](https://semver.org/)) Please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages - ## Wiki -Since there is no way to make a pull request to wiki's repo, I have setup another repo to do that. +Since there is no way to make a pull request to wiki's repo, I have set up another repo to do that. https://github.com/louislam/uptime-kuma-wiki - -## Maintainer +## Maintainer Check the latest issues and pull requests: https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc ### Release Procedures + 1. Draft a release note 1. Make sure the repo is cleared 1. `npm run update-version 1.X.X` @@ -234,22 +231,24 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc 1. SSH to demo site server and update to 1.X.X Checking: + - Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags - Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7) -- Try clean install with Node.js +- Try clean installation with Node.js ### Release Wiki #### Setup Repo -``` + +```bash git clone https://github.com/louislam/uptime-kuma-wiki.git cd uptime-kuma-wiki git remote add production https://github.com/louislam/uptime-kuma.wiki.git ``` #### Push to Production Wiki -``` + +```bash git pull git push production master ``` - From 76cbef85d5082d98b597269477a1b63563f7ac75 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Thu, 2 Dec 2021 11:18:30 +0100 Subject: [PATCH 42/53] Update README.md --- src/languages/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/README.md b/src/languages/README.md index 945fc2078..3c7f40609 100644 --- a/src/languages/README.md +++ b/src/languages/README.md @@ -8,4 +8,4 @@ 6. Add it into `languageList` constant. 7. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done. -If you do not have programming skills, let me know in [Issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏 +If you do not have programming skills, let me know in [the issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏 From 60657132c07b217e84545a942c4faf504eee813e Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Thu, 2 Dec 2021 11:19:59 +0100 Subject: [PATCH 43/53] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3be229315..9afb8596e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -25,4 +25,4 @@ Please delete options that are not relevant. ## Screenshots (if any) -Please do not use any external image service. Instead, just paste in or drag and drop the image here and it will be uploaded automatically. +Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically. From 8f3ef734bc623c5d2aa8da68c813af5af5ab4f0f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Fri, 3 Dec 2021 01:31:19 +0800 Subject: [PATCH 44/53] disable e2e test, as it is getting unstable recently on GitHub action --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 801348266..67dabe8f4 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "build": "vite build --config ./config/vite.config.js", "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test", "test-with-build": "npm run build && npm test", - "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend && jest --runInBand --config=./config/jest.config.js", + "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend", "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js", "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js", "tsc": "tsc", @@ -130,4 +130,4 @@ "typescript": "~4.4.4", "vite": "~2.6.14" } -} \ No newline at end of file +} From 0aca0455ab0d25edfd992eb4e11e8efc78fc19c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Csaba=20Bal=C3=A1zs?= Date: Fri, 3 Dec 2021 08:47:35 +0100 Subject: [PATCH 45/53] HU language typo and missing items (#996) * HU language * run eslint on hu.js * Last HU typo * package.json valid required node engine syntax Package.json required node engine version can contain multiple rules separated with ||. With this mode package-lock.json will be valid and error codes does not diplay. Co-authored-by: Louis Lam --- package.json | 2 +- src/languages/hu.js | 155 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 155 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 67dabe8f4..399ebb153 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "url": "https://github.com/louislam/uptime-kuma.git" }, "engines": { - "node": "14.* >=16.*" + "node": "14.* || >=16.*" }, "scripts": { "install-legacy": "npm install --legacy-peer-deps", diff --git a/src/languages/hu.js b/src/languages/hu.js index 37c9c6fd6..68758dd36 100644 --- a/src/languages/hu.js +++ b/src/languages/hu.js @@ -113,7 +113,7 @@ export default { Email: "Email", Test: "Teszt", "Certificate Info": "Tanúsítvány információk", - "Resolver Server": "Resolver szerver", + "Resolver Server": "DNS szerver", "Resource Record Type": "Resource Record típusa", "Last Result": "Utolsó eredmény", "Create your admin account": "Hozza létre az adminisztrátor felhasználót", @@ -197,4 +197,157 @@ export default { line: "Line Messenger", mattermost: "Mattermost", "Status Page": "Státusz oldal", + "Primary Base URL": "Elsődleges URL", + "Push URL": "Meghívandó URL", + needPushEvery: "Ezt az URL-t kell meghívni minden {0} másodpercben.", + pushOptionalParams: "Opcionális paraméterek: {0}", + defaultNotificationName: "{notification} értesítésem ({number})", + here: "itt", + Required: "Kötelező", + "Bot Token": "Hibás token", + wayToGetTelegramToken: "Innen kaphat token-t: {0}.", + "Chat ID": "Csevegés ID", + supportTelegramChatID: "Támogatja a közvetlen csevegést, csoportnak küldést és csatona ID-t is", + wayToGetTelegramChatID: "A csevegés ID-t kinyerheti azzal, hogy küld egy üzenetet a bot-nak és erre az URL-re ellátogat, ahol láthatja a chat_id:-t", + "YOUR BOT TOKEN HERE": "AZ ÖN BOT TOKENJE ITT", + chatIDNotFound: "Csevegés ID nem található, küldjön egy első üzenetet a bot-nak", + "Post URL": "Cél URL (Post)", + "Content Type": "Tartalom típus (Content Type)", + webhookJsonDesc: "{0} ideális a moderh HTTP szerverekhez, mint az Express.js", + webhookFormDataDesc: "{multipart} ideális a PHP-hez. A JSON értelmezhető ezzel: {decodeFunction}", + secureOptionNone: "Nincs / STARTTLS (25, 587)", + secureOptionTLS: "TLS (465)", + "Ignore TLS Error": "TLS hiba figyelmen kívül hagyása", + "From Email": "Feladó email", + emailCustomSubject: "Egyedi tárgy", + "To Email": "Cél email", + smtpCC: "Másolat", + smtpBCC: "Titkos másolat", + "Discord Webhook URL": "Discord cím (webhook URL)", + wayToGetDiscordURL: "Kaphat egy ilyet, ha ellátogat a Server Settings -> Integrations -> Create Webhook oldalra", + "Bot Display Name": "Bot megjelenő neve", + "Prefix Custom Message": "Egyedi előtét üzenet", + "Hello @everyone is...": "Hello {'@'}mindenki...", + "Webhook URL": "Cím (webhook URL)", + wayToGetTeamsURL: "Itt megnézheti, hogy kell ilyen URL-t készíteni: {0}.", + Number: "Szám", + Recipients: "Címzettek", + needSignalAPI: "Egy Signal kliensre van szüksége, amihez REST API tartozik.", + wayToCheckSignalURL: "Itt megnézheti, hogy hozhat létre egyet:", + signalImportant: "FONTOS! Nem keverheti a csoportokat és számokat a címzetteknél.", + "Application Token": "Alkalmazás token", + "Server URL": "Szerver URL", + Priority: "Prioritás", + "Icon Emoji": "Emoji ikonok", + "Channel Name": "Csatorna neve", + "Uptime Kuma URL": "Uptime Kuma cím", + aboutWebhooks: "Webhook-okról több info: {0}", + aboutChannelName: "Adja meg a {0} csatorna nevét ha szeretné elkerülni a webhook-ot. Pl: #masik-csatorna", + aboutKumaURL: "Ha üresen hagyja a Uptime Kuma cím mezőt, akkor a projekt GitHub oldala lesz az alapértelmezett.", + emojiCheatSheet: "Emoji csalás: {0}", + clicksendsms: "ClickSend SMS", + "User Key": "Felhasználói kulcs", + Device: "Eszköz", + "Message Title": "Üzenet címe", + "Notification Sound": "Értesítési hang", + "More info on:": "További információ: {0}", + pushoverDesc1: "A vészhelyzeti prioritásnak (2) 30 másodperc az újrapróbálkozási alapértéke és egy óra után lejár.", + pushoverDesc2: "Ha különböző eszközökre szeretne értesítést küldeni, töltse ki az Eszköz mezőt.", + "SMS Type": "SMS típusa", + octopushTypePremium: "Premium (Fast - recommended for alerting)", + octopushTypeLowCost: "Low Cost (Slow - sometimes blocked by operator)", + checkPrice: "Nézze meg az {0} féle árat:", + apiCredentials: "API kulcsok", + octopushLegacyHint: "Az Octopush régi (2011-2020) verzióját használja vagy az újat?", + "Check octopush prices": "Nézze meg az Octopush {0} féle árát.", + octopushPhoneNumber: "Telefonszám (nemz. formátum, pl : +36705554433) ", + octopushSMSSender: "SMS küldő neve : 3-11 betű/szám (a-zA-Z0-9) vagy szóköz", + "LunaSea Device ID": "LunaSea eszköz ID", + "Apprise URL": "Apprise cím (URL)", + "Example:": "Például: {0}", + "Read more:": "Itt olvashat róla: {0}", + "Status:": "Állapot: {0}", + "Read more": "Tovább olvasom", + appriseInstalled: "Apprise telepítve.", + appriseNotInstalled: "Apprise nincs telepítve. {0}", + "Access Token": "Elérési token", + "Channel access token": "Csatorna elérési token", + "Line Developers Console": "Line Developers konzol", + lineDevConsoleTo: "Line Developers konzol - {0}", + "Basic Settings": "Alap beállítások", + "User ID": "Felhasználó ID", + "Messaging API": "Üzenet API", + wayToGetLineChannelToken: "{0} első eléréséhez készítsen egy Provider-t és csatornát (Messaging API), utána kaphatja meg a csatorna elérési token-t és felhasználó ID-t az alábbi menüpontban.", + "Icon URL": "Ikon cím (URL)", + aboutIconURL: "Megadhat egy webcímet az Ikon cím mezőben, ezzel felülírva az alapértelmezet képet. Nem kerül felhasználásra, ha az Emoji-k be vannak állítva.", + aboutMattermostChannelName: "Felülírhatja az alapértelmezett csatornát, ahova a webhook az adatokat küldi. Ehhez töltse ki a \"Csatorna neve\" mezőt (pl: #egyeb-csatorna). A Mattermost webhook beállításaiban további engedélyek szükségesek", + matrix: "Matrix", + promosmsTypeEco: "SMS ECO - olcsó, de lassú, gyakran túlterhelt. Csak lengyel címzettekhez.", + promosmsTypeFlash: "SMS FLASH - Az üzenet automatikusan megjelenik a fogadó eszközön. Csak lengyel címzettekhez.", + promosmsTypeFull: "SMS FULL - Prémium szintje az SMS-nek. Megadható a feladó neve, de előtte jóváhagyás szükséges. Ideális értesítésekhez.", + promosmsTypeSpeed: "SMS SPEED - A legmagasabb prioritás a rendszerben. Nagyon gyors és pontos, de költséges (kb. duplája a hagyományos SMS-nek).", + promosmsPhoneNumber: "Telefonszám (lengyel címzett esetén az országkód elhagyható)", + promosmsSMSSender: "SMS feladónév: Előre beállított név vagy az alábbiak egyike: InfoSMS, SMS Info, MaxSMS, INFO, SMS", + "Feishu WebHookUrl": "Feishu webhook cím (URL)", + matrixHomeserverURL: "Homeserver cím (URL http(s):// előtaggal és opcionálisan port-tal)", + "Internal Room Id": "Belső Szoba ID", + matrixDesc1: "A belső szoba ID-t a szpbák speciális beállítások között találja meg a Matrix kliens programban. Így kell kinéznie: !QMdRCpUIfLwsfjxye6:home.server.", + matrixDesc2: "Erősen ajánlott készíteni egy új felhasználót és nem a teljes joggal rendelkező felhasználót használni. Az új felhasználó létrehozása után csak azokba a szobákba kell megjhívni a felhasználót, ahol értesítéseket szeretne kapni. Ezzel a művelettel lehet elérési token-t kérni: {0}", + Method: "Metódus", + Body: "Törzs", + Headers: "Fejlécek", + PushUrl: "Push cím (URL)", + HeadersInvalidFormat: "A kérés fejléc nem egy valós JSON: ", + BodyInvalidFormat: "A kérés törzse nem egy valós JSON: ", + "Monitor History": "Vizsgálatok előzményei", + clearDataOlderThan: "Előzmények megtartása {0} napig.", + PasswordsDoNotMatch: "Jelszó nem egyezik.", + records: "sorok", + "One record": "Egy sor", + steamApiKeyDescription: "Steam Game Server ellenőrzéséhez szükséges egy Steam Web-API kulcs. Itt létrehozhat egy API kulcsot: ", + "Current User": "Felhasználó", + recent: "Legújabb", + Done: "Kész", + Info: "Infó", + Security: "Biztonság", + "Steam API Key": "Steam API kulcs", + "Shrink Database": "Adatbázis tömörítése", + "Pick a RR-Type...": "Válasszon egy RR-típust...", + "Pick Accepted Status Codes...": "Válasszon olyan kódot, ami elfogadottnak számít...", + Default: "Alapért.", + "HTTP Options": "HTTP beállítások", + "Create Incident": "Incidens létrehozása", + Title: "Cím", + Content: "Tartalom", + Style: "Stílus", + info: "info", + warning: "warning", + danger: "danger", + primary: "primary", + light: "light", + dark: "dark", + Post: "Bejegyzés", + "Please input title and content": "Adjon meg címet és tartalmat", + Created: "Létrehozva", + "Last Updated": "Utolsó mód.", + Unpin: "Leválaszt", + "Switch to Light Theme": "Világos témára váltás", + "Switch to Dark Theme": "Sötét témára váltás", + "Show Tags": "Címkék mutatása", + "Hide Tags": "Címkék elrejtése", + Description: "Leírás", + "No monitors available.": "Nincs még figyelő beállítva.", + "Add one": "Adjon hozzá egyet", + "No Monitors": "Nincs figyelő", + "Untitled Group": "Névtelen csoport", + Services: "Szolgáltatások", + Discard: "Elvet", + Cancel: "Mégsem", + "Powered by": "A megoldást szállítja az", + shrinkDatabaseDescription: "VACUUM futtatása az SQLite-on. Ha az adatbázisod 1.10.0-nál újabb, akkor az AUTO_VACUUM engedélyezve van, nincs szükség a műveletre.", + serwersms: "SerwerSMS.pl", + serwersmsAPIUser: "API felhasználónév (webapi_ előtaggal együtt)", + serwersmsAPIPassword: "API jelszó", + serwersmsPhoneNumber: "Telefonszám", + serwersmsSenderName: "SMS feladó neve (regisztrált név az oldalon)", }; From b3d348dcea9433686c02170e8282d42f3005b31b Mon Sep 17 00:00:00 2001 From: Ioma Taani Date: Fri, 3 Dec 2021 08:48:11 +0100 Subject: [PATCH 46/53] Translation Update (#994) * Better translation * better translation * aggiornato --- src/languages/it-IT.js | 49 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js index 6f4626fe7..4b035d4cb 100644 --- a/src/languages/it-IT.js +++ b/src/languages/it-IT.js @@ -166,7 +166,7 @@ export default { Orange: "Arancione", Green: "Verde", Blue: "Blu", - Indigo: "Indigo", + Indigo: "Indaco", Purple: "Viola", Pink: "Rosa", "Search...": "Cerca...", @@ -295,9 +295,9 @@ export default { matrixDesc2: "È altamente raccomandata la creazione di un nuovo utente e di non utilizare il proprio token di accesso Matrix poiché darà pieno controllo al proprio account e a tutte le stanze in cui si ha accesso. Piuttosto, si crei un nuovo utente per invitarlo nella stanza dove si vuole ricevere le notifiche. Si può accedere al token eseguendo {0}", Method: "Metodo", Body: "Corpo", - Headers: "Headers", + Headers: "Intestazioni", PushUrl: "URL di Push", - HeadersInvalidFormat: "L'header di richiesta non è un JSON valido: ", + HeadersInvalidFormat: "L'intestazione di richiesta non è un JSON valido: ", BodyInvalidFormat: "Il corpo di richiesta non è un JSON valido: ", "Monitor History": "Storico monitoraggio", clearDataOlderThan: "Mantieni lo storico per {0} giorni.", @@ -307,5 +307,48 @@ export default { steamApiKeyDescription: "Per monitorare un server di gioco Steam si necessita della chiave Web-API di Steam. È possibile registrare la propria chiave API qui: ", "Current User": "Utente corrente", recent: "Recenti", + Done: "Fatto", + Info: "Info", + Security: "Sicurezza", + "Steam API Key": "Chiave API di Steam", + "Shrink Database": "Comprimi Database", + "Pick a RR-Type...": "Scegli un tipo di RR...", + "Pick Accepted Status Codes...": "Scegli i codici di Stato Accettati...", + Default: "Predefinito", + "HTTP Options": "Opzioni HTTP", + "Create Incident": "Crea Incident", + Title: "Titolo", + Content: "Contenuto", + Style: "Stile", + info: "informativo", + warning: "attenzione", + danger: "critico", + primary: "primario", + light: "chiaro", + dark: "scuro", + Post: "Posta", + "Please input title and content": "Inserire il titolo e il contenuto", + Created: "Creato", + "Last Updated": "Ultima modifica", + Unpin: "Stacca", + "Switch to Light Theme": "Utilizza tema chiaro", + "Switch to Dark Theme": "Utilizza tema scuro", + "Show Tags": "Mostra etichette", + "Hide Tags": "Nascondi etichette", + Description: "Descrizione", + "No monitors available.": "Nessun monitoraggio disponibile.", + "Add one": "Aggiungi", + "No Monitors": "Nessun monitoraggio", + "Add one": "Aggiungi", + "Untitled Group": "Gruppo senza titolo", + Services: "Servizi", + Discard: "Scarta", + Cancel: "Annulla", + "Powered by": "Servito da", shrinkDatabaseDescription: "Lancia il comando VACUUM sul database SQLite. Se il database è stato creato dopo la versione 1.10.0, AUTO_VACUUM è già abilitato e questa azione non è necessaria.", + serwersms: "SerwerSMS.pl", + serwersmsAPIUser: "Nome utente API (incl. prefisso webapi_)", + serwersmsAPIPassword: "Password API", + serwersmsPhoneNumber: "Numero di Telefono", + serwersmsSenderName: "Nome del mittente SMS (registrato via portale cliente)", }; From 481fd3a05f1b566dade2c4ba2e1ff7da83acc81e Mon Sep 17 00:00:00 2001 From: Ashish Bansal <49029528+ashishsecdev@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:19:46 +0530 Subject: [PATCH 47/53] Updated monitor service details in README.md (#990) * Updated monitor service details in README.md Added `Steam Gamer Server' to the monitor service list. * Update README.md * Update README.md * Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ecd33bcba..ea2281667 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollec ## ⭐ Features -* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push. +* Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server. * Fancy, Reactive, Fast UI/UX. * Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [70+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications). * 20 second intervals. From 984a3704e015b8729ab145d80e0f572325e68122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Csaba?= Date: Fri, 3 Dec 2021 22:29:53 +0100 Subject: [PATCH 48/53] HU lang --- src/languages/hu.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/languages/hu.js b/src/languages/hu.js index 68758dd36..adcfce286 100644 --- a/src/languages/hu.js +++ b/src/languages/hu.js @@ -54,19 +54,19 @@ export default { Delete: "Törlés", Current: "Aktuális", Uptime: "Uptime", - "Cert Exp.": "Tanúsítvány lejár", - days: "napok", + "Cert Exp.": "SSL lejárat", + days: "nap", day: "nap", - "-day": "-nap", + "-day": " nap", hour: "óra", - "-hour": "-óra", + "-hour": " óra", Response: "Válasz", Ping: "Ping", "Monitor Type": "Figyelő típusa", Keyword: "Kulcsszó", "Friendly Name": "Rövid név", URL: "URL", - Hostname: "Hostnév", + Hostname: "Hosztnév", Port: "Port", "Heartbeat Interval": "Életjel időköz", Retries: "Újrapróbálkozás", @@ -131,9 +131,9 @@ export default { Events: "Események", Heartbeats: "Életjelek", "Auto Get": "Auto lekérd.", - backupDescription: "Ki tudja menteni az összes figyelőt és értesítést egy JSON fájlba.", - backupDescription2: "Ui.: Történeti és esemény adatokat nem tartalmaz.", - backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyelmesen őrizze!", + backupDescription: "Mentheti az összes figyelőt és értesítést egy JSON fájlba.", + backupDescription2: "Megj: Történeti és esemény adatokat nem tartalmaz.", + backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyeljen erre!", alertNoFile: "Válaszzon ki egy fájlt az importáláshoz.", alertWrongFileType: "Válasszon egy JSON fájlt.", "Clear all statistics": "Összes statisztika törlése", @@ -204,7 +204,7 @@ export default { defaultNotificationName: "{notification} értesítésem ({number})", here: "itt", Required: "Kötelező", - "Bot Token": "Hibás token", + "Bot Token": "BOT token", wayToGetTelegramToken: "Innen kaphat token-t: {0}.", "Chat ID": "Csevegés ID", supportTelegramChatID: "Támogatja a közvetlen csevegést, csoportnak küldést és csatona ID-t is", From 220108ebc6b7e95d8aa8e4172154ef33fcdf6327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Csaba?= Date: Fri, 3 Dec 2021 22:39:38 +0100 Subject: [PATCH 49/53] Upgrade bree to 7.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 399ebb153..148f4aa7e 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "axios": "~0.21.4", "bcryptjs": "~2.4.3", "bootstrap": "5.1.3", - "bree": "~6.3.1", + "bree": "^7.1.0", "chardet": "^1.3.0", "chart.js": "~3.6.0", "chartjs-adapter-dayjs": "~1.0.0", From 5a8162747c76340aad25c5777cd4a522e228bba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Csaba?= Date: Fri, 3 Dec 2021 22:47:40 +0100 Subject: [PATCH 50/53] Upgrade qrcode to 1.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 148f4aa7e..489378657 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "postcss-scss": "~4.0.2", "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.0", - "qrcode": "~1.4.4", + "qrcode": "^1.5.0", "redbean-node": "0.1.3", "socket.io": "~4.2.0", "socket.io-client": "~4.2.0", From d47d8517a801b9826b3d6ce61aef77cf2f22a38d Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 5 Dec 2021 16:05:52 +0800 Subject: [PATCH 51/53] update apprise to 0.9.6 --- docker/alpine-base.dockerfile | 2 +- docker/debian-base.dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/alpine-base.dockerfile b/docker/alpine-base.dockerfile index 922fd2527..d162fe8fb 100644 --- a/docker/alpine-base.dockerfile +++ b/docker/alpine-base.dockerfile @@ -4,5 +4,5 @@ WORKDIR /app # Install apprise, iputils for non-root ping, setpriv RUN apk add --no-cache iputils setpriv dumb-init python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib && \ - pip3 --no-cache-dir install apprise && \ + pip3 --no-cache-dir install apprise==0.9.6 && \ rm -rf /root/.cache diff --git a/docker/debian-base.dockerfile b/docker/debian-base.dockerfile index a4d701674..83fd434be 100644 --- a/docker/debian-base.dockerfile +++ b/docker/debian-base.dockerfile @@ -4,9 +4,9 @@ FROM node:14-buster-slim WORKDIR /app # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv -# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specific --no-install-recommends to skip them, make the base even smaller than alpine! +# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine! RUN apt update && \ apt --yes --no-install-recommends install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \ sqlite3 iputils-ping util-linux dumb-init && \ - pip3 --no-cache-dir install apprise && \ + pip3 --no-cache-dir install apprise==0.9.6 && \ rm -rf /var/lib/apt/lists/* From b62f1475ee54d10fa2b06c18241cdedf90c4a0cf Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 5 Dec 2021 16:28:59 +0800 Subject: [PATCH 52/53] =?UTF-8?q?=F0=9F=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 492 ++++++++++++++++------------------------------ package.json | 4 +- 2 files changed, 166 insertions(+), 330 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b2e0acc9..4790d60ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "axios": "~0.21.4", "bcryptjs": "~2.4.3", "bootstrap": "5.1.3", - "bree": "~6.3.1", + "bree": "~7.1.0", "chardet": "^1.3.0", "chart.js": "~3.6.0", "chartjs-adapter-dayjs": "~1.0.0", @@ -42,7 +42,7 @@ "postcss-scss": "~4.0.2", "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.0", - "qrcode": "~1.4.4", + "qrcode": "~1.5.0", "redbean-node": "0.1.3", "socket.io": "~4.2.0", "socket.io-client": "~4.2.0", @@ -86,7 +86,7 @@ "vite": "~2.6.14" }, "engines": { - "node": "14.*" + "node": "14.* || >=16.*" } }, "node_modules/@babel/code-frame": { @@ -3437,6 +3437,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "dependencies": { "color-convert": "^1.9.0" }, @@ -3891,6 +3892,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -4044,27 +4046,24 @@ } }, "node_modules/bree": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/bree/-/bree-6.3.1.tgz", - "integrity": "sha512-FADpEV5c+3ZuFIBothyyRUxZClJD2PetIo0lmqAFJ3ZMI9WsSmQmmstZ86Dy0G4Gyw3nPNdfYTjV7+9pPtlB8g==", - "deprecated": "bree@7.0.0 drops support for the browser, Node <12.11.0, and removes bthreads entirely. Either upgrade to v7.0.0 or lock your bree version to v6.5.0.", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz", + "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==", "dependencies": { - "@babel/runtime": "^7.12.5", - "@breejs/later": "^4.0.2", - "boolean": "^3.0.2", - "bthreads": "^0.5.1", + "@breejs/later": "^4.1.0", + "boolean": "^3.1.4", "combine-errors": "^3.0.3", - "cron-validate": "^1.4.1", - "debug": "^4.3.1", - "human-interval": "^2.0.0", + "cron-validate": "^1.4.3", + "debug": "^4.3.2", + "human-interval": "^2.0.1", "is-string-and-not-blank": "^0.0.2", "is-valid-path": "^0.1.1", - "ms": "^2.1.2", - "p-wait-for": "3.1.0", + "ms": "^2.1.3", + "p-wait-for": "3", "safe-timers": "^1.1.0" }, "engines": { - "node": ">= 10" + "node": ">= 12.11.0" } }, "node_modules/browser-process-hrtime": { @@ -4105,21 +4104,11 @@ "node-int64": "^0.4.0" } }, - "node_modules/bthreads": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/bthreads/-/bthreads-0.5.1.tgz", - "integrity": "sha512-nK7Jo9ll+r1FRMNPWEFRTZMQrX6HhX8JjPAofxmbTNILHqWVIJPmWzCi9JlX/K0DL5AKZTFZg2Qser5C6gVs9A==", - "dependencies": { - "bufio": "~1.0.5" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -4139,20 +4128,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dependencies": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "node_modules/buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" - }, "node_modules/buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -4167,23 +4142,11 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "node_modules/buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" - }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "node_modules/bufio": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz", - "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==", - "engines": { - "node": ">=8.0.0" - } + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true }, "node_modules/bytes": { "version": "3.1.0", @@ -4465,6 +4428,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -4472,7 +4436,8 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "node_modules/color-support": { "version": "1.1.3", @@ -5061,6 +5026,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "node_modules/encode-utf8": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz", + "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -6384,7 +6354,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -6976,6 +6945,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -7380,11 +7350,6 @@ "node": ">=0.10.0" } }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -9713,7 +9678,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, "dependencies": { "p-locate": "^4.1.0" }, @@ -10783,7 +10747,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, "dependencies": { "p-limit": "^2.2.0" }, @@ -11033,11 +10996,11 @@ } }, "node_modules/pngjs": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", - "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", "engines": { - "node": ">=4.0.0" + "node": ">=10.13.0" } }, "node_modules/postcss": { @@ -11516,133 +11479,73 @@ } }, "node_modules/qrcode": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz", - "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz", + "integrity": "sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==", "dependencies": { - "buffer": "^5.4.3", - "buffer-alloc": "^1.2.0", - "buffer-from": "^1.1.1", "dijkstrajs": "^1.0.1", - "isarray": "^2.0.1", - "pngjs": "^3.3.0", - "yargs": "^13.2.4" + "encode-utf8": "^1.0.3", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" }, "bin": { "qrcode": "bin/qrcode" }, "engines": { - "node": ">=4" + "node": ">=10.13.0" } }, - "node_modules/qrcode/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "node_modules/qrcode/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, "engines": { - "node": ">=6" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/qrcode/node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, - "node_modules/qrcode/node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "node_modules/qrcode/node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "node_modules/qrcode/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dependencies": { - "locate-path": "^3.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=6" + "node": ">=7.0.0" } }, - "node_modules/qrcode/node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "engines": { - "node": ">=4" - } - }, - "node_modules/qrcode/node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/qrcode/node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/qrcode/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "engines": { - "node": ">=4" - } - }, - "node_modules/qrcode/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/qrcode/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } + "node_modules/qrcode/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/qrcode/node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/qrcode/node_modules/y18n": { @@ -11651,29 +11554,36 @@ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "node_modules/qrcode/node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" } }, "node_modules/qrcode/node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" } }, "node_modules/qs": { @@ -17087,6 +16997,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -17447,7 +17358,8 @@ "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "base64id": { "version": "2.0.0", @@ -17567,22 +17479,20 @@ } }, "bree": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/bree/-/bree-6.3.1.tgz", - "integrity": "sha512-FADpEV5c+3ZuFIBothyyRUxZClJD2PetIo0lmqAFJ3ZMI9WsSmQmmstZ86Dy0G4Gyw3nPNdfYTjV7+9pPtlB8g==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz", + "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==", "requires": { - "@babel/runtime": "^7.12.5", - "@breejs/later": "^4.0.2", - "boolean": "^3.0.2", - "bthreads": "^0.5.1", + "@breejs/later": "^4.1.0", + "boolean": "^3.1.4", "combine-errors": "^3.0.3", - "cron-validate": "^1.4.1", - "debug": "^4.3.1", - "human-interval": "^2.0.0", + "cron-validate": "^1.4.3", + "debug": "^4.3.2", + "human-interval": "^2.0.1", "is-string-and-not-blank": "^0.0.2", "is-valid-path": "^0.1.1", - "ms": "^2.1.2", - "p-wait-for": "3.1.0", + "ms": "^2.1.3", + "p-wait-for": "3", "safe-timers": "^1.1.0" } }, @@ -17614,37 +17524,16 @@ "node-int64": "^0.4.0" } }, - "bthreads": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/bthreads/-/bthreads-0.5.1.tgz", - "integrity": "sha512-nK7Jo9ll+r1FRMNPWEFRTZMQrX6HhX8JjPAofxmbTNILHqWVIJPmWzCi9JlX/K0DL5AKZTFZg2Qser5C6gVs9A==", - "requires": { - "bufio": "~1.0.5" - } - }, "buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" } }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" - }, "buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", @@ -17656,20 +17545,11 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" - }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "bufio": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/bufio/-/bufio-1.0.7.tgz", - "integrity": "sha512-bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A==" + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true }, "bytes": { "version": "3.1.0", @@ -17884,6 +17764,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -17891,7 +17772,8 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "color-support": { "version": "1.1.3", @@ -18361,6 +18243,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "encode-utf8": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz", + "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -19330,7 +19217,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, "requires": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -19769,7 +19655,8 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "ignore": { "version": "4.0.6", @@ -20053,11 +19940,6 @@ "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=", "dev": true }, - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -21809,7 +21691,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, "requires": { "p-locate": "^4.1.0" } @@ -22630,7 +22511,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, "requires": { "p-limit": "^2.2.0" } @@ -22810,9 +22690,9 @@ "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=" }, "pngjs": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", - "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==" }, "postcss": { "version": "8.3.11", @@ -23170,100 +23050,55 @@ } }, "qrcode": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz", - "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz", + "integrity": "sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==", "requires": { - "buffer": "^5.4.3", - "buffer-alloc": "^1.2.0", - "buffer-from": "^1.1.1", "dijkstrajs": "^1.0.1", - "isarray": "^2.0.1", - "pngjs": "^3.3.0", - "yargs": "^13.2.4" + "encode-utf8": "^1.0.3", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } }, "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "requires": { - "locate-path": "^3.0.0" + "color-name": "~1.1.4" } }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "y18n": { @@ -23272,26 +23107,27 @@ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^3.0.0", + "string-width": "^4.2.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "yargs-parser": "^18.1.2" } }, "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" diff --git a/package.json b/package.json index 489378657..69aca8bb2 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "axios": "~0.21.4", "bcryptjs": "~2.4.3", "bootstrap": "5.1.3", - "bree": "^7.1.0", + "bree": "~7.1.0", "chardet": "^1.3.0", "chart.js": "~3.6.0", "chartjs-adapter-dayjs": "~1.0.0", @@ -87,7 +87,7 @@ "postcss-scss": "~4.0.2", "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.0", - "qrcode": "^1.5.0", + "qrcode": "~1.5.0", "redbean-node": "0.1.3", "socket.io": "~4.2.0", "socket.io-client": "~4.2.0", From d645e29455e850792d63d01bb3d26080878f5993 Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 5 Dec 2021 17:40:13 +0800 Subject: [PATCH 53/53] mask telegram api url with asterisk --- src/components/notifications/Telegram.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue index 55ff7ec45..d263f636f 100644 --- a/src/components/notifications/Telegram.vue +++ b/src/components/notifications/Telegram.vue @@ -25,7 +25,7 @@

- {{ telegramGetUpdatesURL() }} + {{ telegramGetUpdatesURL("masked") }}

@@ -42,18 +42,22 @@ export default { HiddenInput, }, methods: { - telegramGetUpdatesURL(withToken = false) { + telegramGetUpdatesURL(mode = "masked") { let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`; - if (this.$parent.notification.telegramBotToken && withToken) { - token = this.$parent.notification.telegramBotToken; + if (this.$parent.notification.telegramBotToken) { + if (mode === "withToken") { + token = this.$parent.notification.telegramBotToken; + } else if (mode === "masked") { + token = "*".repeat(this.$parent.notification.telegramBotToken.length); + } } return `https://api.telegram.org/bot${token}/getUpdates`; }, async autoGetTelegramChatID() { try { - let res = await axios.get(this.telegramGetUpdatesURL(true)); + let res = await axios.get(this.telegramGetUpdatesURL("withToken")); if (res.data.result.length >= 1) { let update = res.data.result[res.data.result.length - 1];