From 5e6d945095f0923c4fb748a8fbfe94312a7bc021 Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Wed, 27 Oct 2021 23:06:06 +1300
Subject: [PATCH 001/142] Most hacked in POC
---
server/routers/api-router.js | 8 ++++++--
src/components/PublicGroupList.vue | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index fbe8136e5..be186ccca 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -141,9 +141,13 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
await checkPublished();
const publicGroupList = [];
let list = await R.find("group", " public = 1 ORDER BY weight ");
-
for (let groupBean of list) {
- publicGroupList.push(await groupBean.toPublicJSON());
+ let monitor_info = await groupBean.toPublicJSON()
+ monitor_info.monitorList = await Promise.all(monitor_info.monitorList.map( async (monitor)=>{
+ let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
+ return {...monitor,tags: tags}
+ }))
+ publicGroupList.push(monitor_info);
}
response.json(publicGroupList);
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 23d19e6cd..39fb342e2 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -40,6 +40,7 @@
{{ monitor.element.name }}
+
@@ -59,12 +60,14 @@
import Draggable from "vuedraggable";
import HeartbeatBar from "./HeartbeatBar.vue";
import Uptime from "./Uptime.vue";
+import Tag from "./Tag.vue";
export default {
components: {
Draggable,
HeartbeatBar,
Uptime,
+ Tag,
},
props: {
editMode: {
From 9143b73f844ebd1214c2160a6e1319fa91191b6f Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Thu, 28 Oct 2021 14:53:27 +1300
Subject: [PATCH 002/142] Styling for tags
---
src/assets/app.scss | 4 ++++
src/components/PublicGroupList.vue | 3 +++
2 files changed, 7 insertions(+)
diff --git a/src/assets/app.scss b/src/assets/app.scss
index e1a5d052d..ae1ff687c 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -346,6 +346,10 @@ textarea.form-control {
&.active {
background-color: #cdf8f4;
}
+ // Removes margin to line up tags list with uptime percentage
+ .tags, .tag-wrapper:first-child {
+ margin-left: 0 !important;
+ }
}
}
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 39fb342e2..97441d50e 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -40,6 +40,9 @@
{{ monitor.element.name }}
+
+
+
From 348c5ec995c34d7d17f1e44297e205f04858d787 Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Thu, 28 Oct 2021 15:07:19 +1300
Subject: [PATCH 003/142] Match lint settings
---
server/routers/api-router.js | 7 ++++---
src/components/PublicGroupList.vue | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index be186ccca..bf0cc54c8 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -142,12 +142,13 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
const publicGroupList = [];
let list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) {
- let monitor_info = await groupBean.toPublicJSON()
- monitor_info.monitorList = await Promise.all(monitor_info.monitorList.map( async (monitor)=>{
+ let monitorGroup = await groupBean.toPublicJSON()
+ monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
+ // Includes tags as an array in response, allows for tags to be displayed on public status page
let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
return {...monitor,tags: tags}
}))
- publicGroupList.push(monitor_info);
+ publicGroupList.push(monitorGroup);
}
response.json(publicGroupList);
diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue
index 97441d50e..f30edcef5 100644
--- a/src/components/PublicGroupList.vue
+++ b/src/components/PublicGroupList.vue
@@ -40,7 +40,6 @@
{{ monitor.element.name }}
-
From 24664cde2c204f5809c193643837b097cdce81af Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Thu, 28 Oct 2021 15:22:35 +1300
Subject: [PATCH 004/142] Smarter CSS to fix Mobile alignment
---
src/assets/app.scss | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/assets/app.scss b/src/assets/app.scss
index ae1ff687c..db01e12d2 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -346,9 +346,9 @@ textarea.form-control {
&.active {
background-color: #cdf8f4;
}
- // Removes margin to line up tags list with uptime percentage
- .tags, .tag-wrapper:first-child {
- margin-left: 0 !important;
+ .tags {
+ // Removes margin to line up tags list with uptime percentage
+ margin-left: -0.25rem;
}
}
}
From b32bfb3ff1578483dd3b8f10e3a05aa83a1fc3cf Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Fri, 29 Oct 2021 18:19:24 +1300
Subject: [PATCH 005/142] Added toggle for tag visibility
---
server/routers/api-router.js | 18 +++++++++++++-----
src/pages/StatusPage.vue | 31 +++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index bf0cc54c8..b58c4a002 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -101,6 +101,10 @@ router.get("/api/status-page/config", async (_request, response) => {
config.statusPagePublished = true;
}
+ if (! config.statusPageTags) {
+ config.statusPageTags = "hidden";
+ }
+
if (! config.title) {
config.title = "Uptime Kuma";
}
@@ -143,11 +147,15 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
let list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) {
let monitorGroup = await groupBean.toPublicJSON()
- monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
- // Includes tags as an array in response, allows for tags to be displayed on public status page
- let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
- return {...monitor,tags: tags}
- }))
+ console.log("\n\nsettings", await getSettings("statusPage"))
+ if ((await getSettings("statusPage")).statusPageTags=="visible") {
+ monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
+ // Includes tags as an array in response, allows for tags to be displayed on public status page
+ let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
+ return {...monitor,tags: tags}
+ }))
+ }
+
publicGroupList.push(monitorGroup);
}
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 87634f35a..4ee810c7f 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -77,6 +77,16 @@
{{ $t("Switch to Dark Theme") }}
+
+
+
+ {{ $t("Show Tags") }}
+
+
+
+
+ {{ $t("Hide Tags") }}
+
@@ -292,6 +302,10 @@ export default {
return this.config.statusPageTheme;
},
+ tagsVisible() {
+ return this.config.statusPageTags
+ },
+
logoClass() {
if (this.editMode) {
return {
@@ -472,6 +486,23 @@ export default {
changeTheme(name) {
this.config.statusPageTheme = name;
},
+ changeTagsVisibilty(newState) {
+ this.config.statusPageTags = newState;
+
+ // On load, if the status page will not include tags if it's not enabled for security reasons
+ // Which means if we enable tags, it won't show in the UI until saved
+ // So we have this to enhance UX and load in the tags from the authenticated source instantly
+ this.$root.publicGroupList = this.$root.publicGroupList.map((group)=>{
+ return {...group,
+ monitorList: group.monitorList.map((monitor)=> {
+ // We only include the tags if visible so we can reuse the logic to hide the tags on disable
+ return {...monitor,
+ tags: newState==="visible" ? this.$root.monitorList[monitor.id].tags : []
+ }
+ })
+ }
+ });
+ },
/**
* Crop Success
From 74688e69aa6313c14a87bab53a5712f900bd0b20 Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Sat, 30 Oct 2021 00:58:46 +1300
Subject: [PATCH 006/142] Remove debug statement in
server/routers/api-router.js
Co-authored-by: Adam Stachowicz
---
server/routers/api-router.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index b58c4a002..a5d12450c 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -147,7 +147,6 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
let list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) {
let monitorGroup = await groupBean.toPublicJSON()
- console.log("\n\nsettings", await getSettings("statusPage"))
if ((await getSettings("statusPage")).statusPageTags=="visible") {
monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
// Includes tags as an array in response, allows for tags to be displayed on public status page
From 8ec858fd1424c06ac1127f87b8dfca486a65e14b Mon Sep 17 00:00:00 2001
From: Minvinea <29579830+Minvinea@users.noreply.github.com>
Date: Sun, 31 Oct 2021 21:18:36 +0100
Subject: [PATCH 007/142] Add missing translation
Line 282 to 306
---
src/languages/fr-FR.js | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 062435d73..176a6150f 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -279,4 +279,29 @@ export default {
promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+ "Primary Base URL": "Primary Base URL",
+ emailCustomSubject: "Sujet personalisé",
+ clicksendsms: "ClickSend SMS",
+ checkPrice: "Vérification {0} tarifs:",
+ apiCredentials: "Crédentials de l'API",
+ octopushLegacyHint: "Vous utilisez l'ancienne version d'Octopush (2011-2020) ou la nouvelle version ?",
+ "Feishu WebHookUrl": "Feishu WebHookURL",
+ matrixHomeserverURL: "L'URL du serveur (avec http(s):// et le port de manière facultatif)",
+ "Internal Room Id": "ID de la salle interne",
+ matrixDesc1: "Vous pouvez trouvez l'ID de salle interne en regardant dans la section avancée des paramètres dans le client Matrix. C'est sensé ressembler à: !QMdRCpUIfLwsfjxye6:home.server.",
+ matrixDesc2: "Il est fortement recommandé de créer un nouvel utilisateur et de ne pas utiliser le jeton d'accès de votre propre utilisateur Matrix, car il vous donnera un accès complet à votre compte et à toutes les salles que vous avez rejointes. Au lieu de cela, créez un nouvel utilisateur et invitez-le uniquement dans la salle dans laquelle vous souhaitez recevoir la notification. Vous pouvez obtenir le jeton d'accès en exécutant {0}",
+ Method: "Méthode",
+ Body: "Le corps",
+ Headers: "En-têtes",
+ PushUrl: "Push URL",
+ HeadersInvalidFormat: "L'en-têtes de la requête n'est pas dans un format JSON valide: ",
+ BodyInvalidFormat: "Le corps de la requête n'est pas dans un format JSON valide: ",
+ "Monitor History": "Historique de la sonde",
+ clearDataOlderThan: "Garder l'historique des données de la sonde durant {0} jours.",
+ PasswordsDoNotMatch: "Les mots de passe ne correspondent pas.",
+ records: "Enregistrements",
+ "One record": "Un enregistrement",
+ steamApiKeyDescription: "Pour surveiller un serveur Steam, vous avez besoin d'une clé Steam Web-API. Vous pouvez enregistrer votre clé ici: ",
+ "Current User": "Utilisateur actuel",
+ recent: "Récent",
};
From 4004926e643e63a2a8d6915cef6af6992225aa9f Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Mon, 1 Nov 2021 12:52:21 +1300
Subject: [PATCH 008/142] Small formatting changes from code-review
Co-authored-by: deef
---
src/pages/StatusPage.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 4ee810c7f..06be16169 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -493,10 +493,12 @@ export default {
// Which means if we enable tags, it won't show in the UI until saved
// So we have this to enhance UX and load in the tags from the authenticated source instantly
this.$root.publicGroupList = this.$root.publicGroupList.map((group)=>{
- return {...group,
+ return {
+ ...group,
monitorList: group.monitorList.map((monitor)=> {
// We only include the tags if visible so we can reuse the logic to hide the tags on disable
- return {...monitor,
+ return {
+ ...monitor,
tags: newState==="visible" ? this.$root.monitorList[monitor.id].tags : []
}
})
From 12ef9f39c51fac03f5a18ba4182a9a81328c662f Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Mon, 1 Nov 2021 13:23:46 +1300
Subject: [PATCH 009/142] Merged buttons, cleaned up SS tag retrieval and made
tagsVisible a bool.
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
---
server/routers/api-router.js | 19 +++++++++++++------
src/pages/StatusPage.vue | 19 ++++++++++---------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index a5d12450c..30f6a828c 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -102,7 +102,7 @@ router.get("/api/status-page/config", async (_request, response) => {
}
if (! config.statusPageTags) {
- config.statusPageTags = "hidden";
+ config.statusPageTags = false;
}
if (! config.title) {
@@ -144,15 +144,22 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
try {
await checkPublished();
const publicGroupList = [];
- let list = await R.find("group", " public = 1 ORDER BY weight ");
+ const tagsVisible = (await getSettings("statusPage")).statusPageTags;
+ const list = await R.find("group", " public = 1 ORDER BY weight ");
for (let groupBean of list) {
- let monitorGroup = await groupBean.toPublicJSON()
- if ((await getSettings("statusPage")).statusPageTags=="visible") {
+ let monitorGroup = await groupBean.toPublicJSON();
+ if (tagsVisible) {
monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
// Includes tags as an array in response, allows for tags to be displayed on public status page
- let tags = await R.getAll("SELECT mt.monitor_id,mt.value, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [monitor.id]);
+ const tags = await R.getAll(
+ `SELECT monitor_tag.monitor_id, monitor_tag.value, tag.name, tag.color
+ FROM monitor_tag
+ JOIN tag
+ ON monitor_tag.tag_id = tag.id
+ WHERE monitor_tag.monitor_id = ?`, [monitor.id]
+ );
return {...monitor,tags: tags}
- }))
+ }));
}
publicGroupList.push(monitorGroup);
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 06be16169..1320f093b 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -78,14 +78,15 @@
{{ $t("Switch to Dark Theme") }}
-
-
- {{ $t("Show Tags") }}
-
-
-
-
- {{ $t("Hide Tags") }}
+
+
+
+ {{ $t("Hide Tags") }}
+
+
+
+ {{ $t("Show Tags") }}
+
@@ -499,7 +500,7 @@ export default {
// We only include the tags if visible so we can reuse the logic to hide the tags on disable
return {
...monitor,
- tags: newState==="visible" ? this.$root.monitorList[monitor.id].tags : []
+ tags: newState ? this.$root.monitorList[monitor.id].tags : []
}
})
}
From f3651a1219a12b28e66964fb4fcd90eb742d3cad Mon Sep 17 00:00:00 2001
From: Jagger <634750802@qq.com>
Date: Mon, 1 Nov 2021 13:31:31 +0800
Subject: [PATCH 010/142] Add a status prefix for feishu notification
---
server/notification-providers/feishu.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/notification-providers/feishu.js b/server/notification-providers/feishu.js
index a3e340301..05fc9c186 100644
--- a/server/notification-providers/feishu.js
+++ b/server/notification-providers/feishu.js
@@ -27,7 +27,7 @@ class Feishu extends NotificationProvider {
content: {
post: {
zh_cn: {
- title: "UptimeKuma Alert: " + monitorJSON["name"],
+ title: "UptimeKuma Alert: [Down] " + monitorJSON["name"],
content: [
[
{
@@ -54,7 +54,7 @@ class Feishu extends NotificationProvider {
content: {
post: {
zh_cn: {
- title: "UptimeKuma Alert: " + monitorJSON["name"],
+ title: "UptimeKuma Alert: [Up] " + monitorJSON["name"],
content: [
[
{
From 191b81ee07ab919123427d6ef1998969350b5d8f Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Mon, 1 Nov 2021 22:14:41 +1300
Subject: [PATCH 011/142] Fix grammer in comment
Co-authored-by: Nelson Chan
---
src/pages/StatusPage.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 1320f093b..70367cc9f 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -490,7 +490,7 @@ export default {
changeTagsVisibilty(newState) {
this.config.statusPageTags = newState;
- // On load, if the status page will not include tags if it's not enabled for security reasons
+ // On load, the status page will not include tags if it's not enabled for security reasons
// Which means if we enable tags, it won't show in the UI until saved
// So we have this to enhance UX and load in the tags from the authenticated source instantly
this.$root.publicGroupList = this.$root.publicGroupList.map((group)=>{
From 83ee46454a86f5d4b2e477b8972ced7d96f583b7 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:12:46 +0800
Subject: [PATCH 012/142] Update bug_report.yaml
---
.github/ISSUE_TEMPLATE/bug_report.yaml | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 81ea9a32d..1dcfea8c2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -16,7 +16,7 @@ body:
validations:
required: true
attributes:
- label: "👍 Expected behavior"
+ label: "👀 Expected behavior"
description: "What did you think would happen?"
placeholder: "..."
- type: textarea
@@ -24,13 +24,13 @@ body:
validations:
required: true
attributes:
- label: "👎 Actual Behavior"
+ label: "😓 Actual Behavior"
description: "What actually happen?"
placeholder: "..."
- type: input
id: uptime-kuma-version
attributes:
- label: "🐻 Uptime-Kuma version"
+ label: "🐻 Uptime-Kuma Version"
description: "Which version of Uptime-Kuma are you running?"
placeholder: "Ex. 1.9.x"
validations:
@@ -38,9 +38,9 @@ body:
- type: input
id: operating-system
attributes:
- label: "💻 Operating System"
+ label: "💻 Operating System and Arch"
description: "Which OS is your server/device running on?"
- placeholder: "Ex. Ubuntu 20.04"
+ placeholder: "Ex. Ubuntu 20.04 x86"
validations:
required: true
- type: input
@@ -54,17 +54,9 @@ body:
- type: input
id: docker-version
attributes:
- label: "🐋 Docker"
+ label: "🐋 Docker Version"
description: "If running with Docker, which version are you running?"
- placeholder: "Ex. 20.10.9"
- validations:
- required: false
- - type: input
- id: docker-image-tag
- attributes:
- label: "🏷️ Docker Image Tag"
- description: "Which Docker image tag are you using? If running '1' or 'latest', please specify image hash."
- placeholder: "Ex. 1.9.1"
+ placeholder: "Ex. 20.10.9 / K8S / Podman"
validations:
required: false
- type: input
@@ -82,7 +74,7 @@ body:
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
validations:
- required: false
+ required: false
- type: checkboxes
id: no-duplicate-issues
attributes:
From 541068ff3bfbbba514d50f4279e0bf4b6bdb4349 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:23:47 +0800
Subject: [PATCH 013/142] Update bug_report.yaml
---
.github/ISSUE_TEMPLATE/bug_report.yaml | 50 +++++++++++++++-----------
1 file changed, 29 insertions(+), 21 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 1dcfea8c2..53028bf00 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,8 +1,31 @@
name: "🐛 Bug Report"
description: "Submit a bug report to help us improve"
-title: "[Bug]: "
+title: "[Bug] "
labels: [bug]
body:
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "⚠️ Please verify that this bug has NOT been raised before."
+ description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+ options:
+ - label: "I checked and didn't find similar issue"
+ required: true
+ - type: checkboxes
+ attributes:
+ label: "🛡️ Security Policy"
+ description: Please review the security policy before reporting security related issues/bugs.
+ options:
+ - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
+ required: true
+ - type: textarea
+ id: description
+ validations:
+ required: false
+ attributes:
+ label: "Description"
+ description: "You could also upload screenshots"
+ placeholder: ""
- type: textarea
id: steps-to-reproduce
validations:
@@ -31,8 +54,8 @@ body:
id: uptime-kuma-version
attributes:
label: "🐻 Uptime-Kuma Version"
- description: "Which version of Uptime-Kuma are you running?"
- placeholder: "Ex. 1.9.x"
+ description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
+ placeholder: "Ex. 1.10.0"
validations:
required: true
- type: input
@@ -48,7 +71,7 @@ body:
attributes:
label: "🌐 Browser"
description: "Which browser are you running on?"
- placeholder: "Ex. Firefox"
+ placeholder: "Ex. Google Chrome 95.0.4638.69"
validations:
required: true
- type: input
@@ -56,7 +79,7 @@ body:
attributes:
label: "🐋 Docker Version"
description: "If running with Docker, which version are you running?"
- placeholder: "Ex. 20.10.9 / K8S / Podman"
+ placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
validations:
required: false
- type: input
@@ -74,19 +97,4 @@ body:
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
validations:
- required: false
- - type: checkboxes
- id: no-duplicate-issues
- attributes:
- label: "⚠️ Please verify that this bug has NOT been raised before."
- description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
- options:
- - label: "I checked and didn't find similar issue"
- required: true
- - type: checkboxes
- attributes:
- label: "🛡️ Security Policy"
- description: Please review the security policy before reporting security related issues/bugs.
- options:
- - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
- required: true
+ required: false
From b2bc8d9db95d5b4d15d69eeb3da01fe26cb7d1c4 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:24:15 +0800
Subject: [PATCH 014/142] Update bug_report.yaml
---
.github/ISSUE_TEMPLATE/bug_report.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 53028bf00..90296e12b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -25,7 +25,6 @@ body:
attributes:
label: "Description"
description: "You could also upload screenshots"
- placeholder: ""
- type: textarea
id: steps-to-reproduce
validations:
From da0eaddeb806e31e5264f41d29bef79384abb5ff Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:25:34 +0800
Subject: [PATCH 015/142] Update SECURITY.md
---
SECURITY.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/SECURITY.md b/SECURITY.md
index 7b9bfca41..3a11e8817 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,5 +1,11 @@
# Security Policy
+## Reporting a Vulnerability
+
+Please report security issues to uptime@kuma.pet.
+
+Do not use the issue tracker or discuss it in the public as it will cause more damage.
+
## Supported Versions
Use this section to tell people about which versions of your project are
@@ -23,9 +29,3 @@ currently being supported with security updates.
| debian | :white_check_mark: |
| alpine | :white_check_mark: |
| All other tags | ❌ |
-
-## Reporting a Vulnerability
-
-Please report security issues to uptime@kuma.pet.
-
-Do not use the issue tracker or discuss it in the public as it will cause more damage.
From 973c2bb429a93ea3ff9f85257489886ecd70558b Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:30:13 +0800
Subject: [PATCH 016/142] Update ask-for-help.yaml
---
.github/ISSUE_TEMPLATE/ask-for-help.yaml | 56 ++++++++++--------------
1 file changed, 24 insertions(+), 32 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
index a1425c9c9..a84eddae9 100644
--- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml
+++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
@@ -3,6 +3,21 @@ description: "Submit any question related to Uptime Kuma"
title: "[Help]: "
labels: [help]
body:
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "⚠️ Please verify that this bug has NOT been raised before."
+ description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+ options:
+ - label: "I checked and didn't find similar issue"
+ required: true
+ - type: checkboxes
+ attributes:
+ label: "🛡️ Security Policy"
+ description: Please review the security policy before reporting security related issues/bugs.
+ options:
+ - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
+ required: true
- type: textarea
id: steps-to-reproduce
validations:
@@ -14,17 +29,17 @@ body:
- type: input
id: uptime-kuma-version
attributes:
- label: "🐻 Uptime-Kuma version"
- description: "Which version of Uptime-Kuma are you running?"
- placeholder: "Ex. 1.9.x"
+ label: "🐻 Uptime-Kuma Version"
+ description: "Which version of Uptime-Kuma are you running? Please do NOT provide the docker tag such as latest or 1"
+ placeholder: "Ex. 1.10.0"
validations:
required: true
- type: input
id: operating-system
attributes:
- label: "💻 Operating System"
+ label: "💻 Operating System and Arch"
description: "Which OS is your server/device running on?"
- placeholder: "Ex. Ubuntu 20.04"
+ placeholder: "Ex. Ubuntu 20.04 x86"
validations:
required: true
- type: input
@@ -32,23 +47,15 @@ body:
attributes:
label: "🌐 Browser"
description: "Which browser are you running on?"
- placeholder: "Ex. Firefox"
+ placeholder: "Ex. Google Chrome 95.0.4638.69"
validations:
required: true
- type: input
id: docker-version
attributes:
- label: "🐋 Docker"
+ label: "🐋 Docker Version"
description: "If running with Docker, which version are you running?"
- placeholder: "Ex. 20.10.9"
- validations:
- required: false
- - type: input
- id: docker-image-tag
- attributes:
- label: "🏷️ Docker Image Tag"
- description: "Which Docker image tag are you using? If running '1' or 'latest', please specify image hash."
- placeholder: "Ex. 1.9.1"
+ placeholder: "Ex. Docker 20.10.9 / K8S / Podman"
validations:
required: false
- type: input
@@ -56,21 +63,6 @@ body:
attributes:
label: "🟩 NodeJS Version"
description: "If running with Node.js? which version are you running?"
- placeholder: "14.x"
+ placeholder: "Ex. 14.18.0"
validations:
required: false
- - type: checkboxes
- id: no-duplicate-issues
- attributes:
- label: "⚠️ Please verify that this question has NOT been raised before."
- description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
- options:
- - label: "I checked and didn't find similar question"
- required: true
- - type: checkboxes
- attributes:
- label: "🛡️ Security Policy"
- description: Please review the security policy before reporting security related issues/bugs.
- options:
- - label: I agree to have read this project [Security Policy](https://github.com/louislam/uptime-kuma/security/policy)
- required: true
From 17e59f1d8d3da67e798f902475375328721fc6eb Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:30:39 +0800
Subject: [PATCH 017/142] Update ask-for-help.yaml
---
.github/ISSUE_TEMPLATE/ask-for-help.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
index a84eddae9..76a78e5c3 100644
--- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml
+++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
@@ -1,6 +1,6 @@
name: "❓ Ask for help"
description: "Submit any question related to Uptime Kuma"
-title: "[Help]: "
+title: "[Help] "
labels: [help]
body:
- type: checkboxes
From df80f413b5bc95cd315607c36fce72fd3b629e35 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:31:19 +0800
Subject: [PATCH 018/142] Update feature_request.yaml
---
.github/ISSUE_TEMPLATE/feature_request.yaml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 1a3cebc09..6464e276a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,8 +1,16 @@
name: 🚀 Feature Request
description: "Submit a proposal for a new feature"
-title: "[Feature]: "
+title: "[Feature] "
labels: [enhancement]
body:
+ - type: checkboxes
+ id: no-duplicate-issues
+ attributes:
+ label: "⚠️ Please verify that this feature request has NOT been suggested before."
+ description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
+ options:
+ - label: "I checked and didn't find similar feature request"
+ required: true
- type: dropdown
id: feature-area
attributes:
@@ -49,11 +57,3 @@ body:
label: "📝 Additional Context"
description: "Add any other context or screenshots about the feature request here."
placeholder: "..."
- - type: checkboxes
- id: no-duplicate-issues
- attributes:
- label: "⚠️ Please verify that this feature request has NOT been suggested before."
- description: "Search in the issues sections by clicking [HERE](https://github.com/louislam/uptime-kuma/issues?q=)"
- options:
- - label: "I checked and didn't find similar feature request"
- required: true
From dec84282ede9c8821c652b67feac2646c19867f4 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 13:31:27 +0800
Subject: [PATCH 019/142] Update bug_report.yaml
---
.github/ISSUE_TEMPLATE/bug_report.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 90296e12b..055c3a626 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -86,7 +86,7 @@ body:
attributes:
label: "🟩 NodeJS Version"
description: "If running with Node.js? which version are you running?"
- placeholder: "14.x"
+ placeholder: "Ex. 14.18.0"
validations:
required: false
- type: textarea
From 8e6173c05ee11a26935bed6423064cc3d2f12fa7 Mon Sep 17 00:00:00 2001
From: Your Name
Date: Mon, 1 Nov 2021 23:10:34 +0100
Subject: [PATCH 020/142] Fix and add new hr-HR translations
---
src/languages/hr-HR.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js
index 35383a0f3..2fb04bb33 100644
--- a/src/languages/hr-HR.js
+++ b/src/languages/hr-HR.js
@@ -10,7 +10,7 @@ export default {
passwordNotMatchMsg: "Lozinke se ne poklapaju.",
notificationDescription: "Obavijesti će funkcionirati samo ako su dodijeljene monitoru.",
keywordDescription: "Ključna riječ za pretragu kao običan HTML ili u JSON formatu. Pretraga je case-sensitive.",
- pauseDashboardHome: "Pauziraj",
+ pauseDashboardHome: "Pauzirano",
deleteMonitorMsg: "Jeste li sigurni da želite izbrisati monitor?",
deleteNotificationMsg: "Jeste li sigurni da želite izbrisati ovu obavijest za sve monitore?",
resoverserverDescription: "Cloudflare je zadani DNS poslužitelj. Možete to promijeniti u bilo kojem trenutku.",
@@ -25,7 +25,7 @@ export default {
twoFAVerifyLabel: "Unesite svoj 2FA token:",
tokenValidSettingsMsg: "Token je važeći! Sada možete spremiti postavke dvofaktorske autentikacije.",
confirmEnableTwoFAMsg: "Želite li omogućiti dvofaktorsku autentikaciju?",
- confirmDisableTwoFAMsg: "Are you sure you want to disable dvofaktorsku autentikaciju?",
+ confirmDisableTwoFAMsg: "Jeste li sigurni da želite onemogućiti dvofaktorsku autentikaciju?",
Settings: "Postavke",
Dashboard: "Kontrolna ploča",
"New Update": "Novo ažuriranje",
@@ -44,7 +44,7 @@ export default {
Down: "Nedostupno",
Pending: "U tijeku",
Unknown: "Nepoznato",
- Pause: "Pauzirano",
+ Pause: "Pauziraj",
Name: "Naziv monitora",
Status: "Status",
DateTime: "Vremenska oznaka",
@@ -307,4 +307,5 @@ export default {
"Showing {from} to {to} of {count} records": "Prikaz zapisa {from}-{to} od sveukupno {count}",
steamApiKeyDescription: "Za praćenje Steam poslužitelja za igru, potrebno je imati Steam Web-API ključ. Možete registrirati vlastiti ključ ovdje: ",
"Current User": "Trenutni korisnik",
+ recent: "Nedavno",
};
From 9a135deac2925fa0625ff100d17b44ab491dfab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Tue, 2 Nov 2021 11:48:55 +0100
Subject: [PATCH 021/142] Add new translation for 'Uptime'
---
src/languages/hr-HR.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js
index 2fb04bb33..29d1343d1 100644
--- a/src/languages/hr-HR.js
+++ b/src/languages/hr-HR.js
@@ -54,7 +54,7 @@ export default {
Edit: "Uredi",
Delete: "Obriši",
Current: "Trenutno",
- Uptime: "Uptime",
+ Uptime: "Dostupnost",
"Cert Exp.": "Istek cert.",
days: "dana",
day: "dan",
From 1fb9b25d1357383ed720860901c3df1606d7179d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Tue, 2 Nov 2021 14:09:01 +0100
Subject: [PATCH 022/142] Improve hr-HR translations
---
src/languages/hr-HR.js | 50 +++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js
index 29d1343d1..01674dce8 100644
--- a/src/languages/hr-HR.js
+++ b/src/languages/hr-HR.js
@@ -2,15 +2,14 @@ export default {
languageName: "Hrvatski",
checkEverySecond: "Provjera svake {0} sekunde",
retryCheckEverySecond: "Ponovni pokušaj svake {0} sekunde",
- retriesDescription: "Broj ponovnih pokušaja prije nego će se servis označiti kao DOWN te poslati obavijest",
+ retriesDescription: "Broj ponovnih pokušaja prije nego će se servis označiti kao nedostupan te poslati obavijest",
ignoreTLSError: "Ignoriraj TLS/SSL pogreške za HTTPS web stranice",
- upsideDownModeDescription: "Preokreni logiku statusa. Ako je usluga dostupna, smatra se da je DOWN.",
+ upsideDownModeDescription: "Preokreni logiku statusa. Ako se primi pozitivan odgovor, smatra se da je usluga nedostupna.",
maxRedirectDescription: "Maksimalan broj preusmjeravanja. Postaviti na 0 kako bi se preusmjeravanja onemogućila.",
acceptedStatusCodesDescription: "Odaberite statusne kodove koji se smatraju uspješnim odgovorom.",
passwordNotMatchMsg: "Lozinke se ne poklapaju.",
notificationDescription: "Obavijesti će funkcionirati samo ako su dodijeljene monitoru.",
- keywordDescription: "Ključna riječ za pretragu kao običan HTML ili u JSON formatu. Pretraga je case-sensitive.",
- pauseDashboardHome: "Pauzirano",
+ keywordDescription: "Ključna riječ za pretragu, u obliku običnog HTML-a ili u JSON formatu. Pretraga je osjetljiva na velika i mala slova.",
deleteMonitorMsg: "Jeste li sigurni da želite izbrisati monitor?",
deleteNotificationMsg: "Jeste li sigurni da želite izbrisati ovu obavijest za sve monitore?",
resoverserverDescription: "Cloudflare je zadani DNS poslužitelj. Možete to promijeniti u bilo kojem trenutku.",
@@ -44,12 +43,13 @@ export default {
Down: "Nedostupno",
Pending: "U tijeku",
Unknown: "Nepoznato",
- Pause: "Pauziraj",
- Name: "Naziv monitora",
+ pauseDashboardHome: "Pauzirano",
+ Name: "Naziv",
Status: "Status",
DateTime: "Vremenska oznaka",
Message: "Izvještaj",
"No important events": "Nema važnih događaja",
+ Pause: "Pauziraj",
Resume: "Nastavi",
Edit: "Uredi",
Delete: "Obriši",
@@ -65,12 +65,12 @@ export default {
Ping: "Odziv",
"Monitor Type": "Vrsta Monitora",
Keyword: "Ključna riječ",
- "Friendly Name": "Lijep naziv",
+ "Friendly Name": "Prilagođen naziv",
URL: "URL",
Hostname: "Domaćin",
Port: "Port",
"Heartbeat Interval": "Interval provjere",
- Retries: "Ponovnih pokušaja",
+ Retries: "Broj ponovnih pokušaja",
"Heartbeat Retry Interval": "Interval ponovnih pokušaja",
Advanced: "Napredne postavke",
"Upside Down Mode": "Obrnuti način",
@@ -86,14 +86,14 @@ export default {
Light: "Svijetli način",
Dark: "Tamni način",
Auto: "Automatski",
- "Theme - Heartbeat Bar": "Tema - Statusna traka",
+ "Theme - Heartbeat Bar": "Tema za traku dostupnosti",
Normal: "Normalno",
Bottom: "Ispod",
None: "Isključeno",
Timezone: "Vremenska zona",
- "Search Engine Visibility": "Vidljivost pretraživačima",
+ "Search Engine Visibility": "Vidljivost tražilicama",
"Allow indexing": "Dopusti indeksiranje",
- "Discourage search engines from indexing site": "Sprječavanje indeksiranja stranice",
+ "Discourage search engines from indexing site": "Sprječavanje indeksiranja",
"Change Password": "Promjena lozinke",
"Current Password": "Trenutna lozinka",
"New Password": "Nova lozinka",
@@ -103,7 +103,7 @@ export default {
"Enable Auth": "Omogući autentikaciju",
Logout: "Odjava",
Leave: "Poništi",
- "I understand, please disable": "Razumijem, onemogući",
+ "I understand, please disable": "Razumijem, svejedno onemogući",
Confirm: "Potvrda",
Yes: "Da",
No: "Ne",
@@ -112,10 +112,10 @@ export default {
"Remember me": "Zapamti me",
Login: "Prijava",
"No Monitors, please": "Nema monitora, ",
- "add one": "dodaj jednog",
+ "add one": "dodaj jedan",
"Notification Type": "Tip obavijesti",
Email: "E-pošta",
- Test: "Test",
+ Test: "Testiraj",
"Certificate Info": "Informacije o certifikatu",
"Resolver Server": "DNS poslužitelj",
"Resource Record Type": "Vrsta DNS zapisa",
@@ -130,14 +130,14 @@ export default {
notAvailableShort: "N/A",
"Default enabled": "Omogući za nove monitore",
"Apply on all existing monitors": "Primijeni na postojeće monitore",
- Create: "Create",
- "Clear Data": "Clear Data",
- Events: "Events",
+ Create: "Kreiraj",
+ "Clear Data": "Obriši podatke",
+ Events: "Događaji",
Heartbeats: "Provjere",
"Auto Get": "Automatski dohvat",
backupDescription: "Moguće je napraviti sigurnosnu kopiju svih monitora i obavijesti koja će biti spremljena kao JSON datoteka.",
backupDescription2: "Napomena: povijest i podaci o događajima nisu uključeni u sigurnosnu kopiju.",
- backupDescription3: "Osjetljivi podaci poput tokena za obavijesti jesu uključeni u sigurnosnu kopiju. Zato je potrebno čuvati izvoz na sigurnom mjestu.",
+ backupDescription3: "Osjetljivi podaci poput tokena za obavijesti uključeni su u sigurnosnu kopiju. Zato je potrebno čuvati izvoz na sigurnom mjestu.",
alertNoFile: "Datoteka za uvoz nije odabrana.",
alertWrongFileType: "Datoteka za uvoz nije u JSON formatu.",
"Clear all statistics": "Obriši sve statistike",
@@ -152,7 +152,7 @@ export default {
"2FA Settings": "Postavke 2FA",
"Two Factor Authentication": "Dvofaktorska autentikacija",
Active: "Aktivna",
- Inactive: "Neaktivna",
+ Inactive: "Neaktivno",
Token: "Token",
"Show URI": "Pokaži URI",
Tags: "Oznake",
@@ -172,7 +172,7 @@ export default {
"Search...": "Pretraga...",
"Avg. Ping": "Prosječni odziv",
"Avg. Response": "Prosječni odgovor",
- "Entry Page": "Entry Page",
+ "Entry Page": "Početna stranica",
statusPageNothing: "Ovdje nema ničega, dodajte grupu ili monitor.",
"No Services": "Nema usluga",
"All Systems Operational": "Svi sustavi su operativni",
@@ -183,7 +183,7 @@ export default {
"Edit Status Page": "Uredi Statusnu stranicu",
"Go to Dashboard": "Na Kontrolnu ploču",
"Status Page": "Statusna stranica",
- defaultNotificationName: "Moja {notification} obavijest ({number})",
+ defaultNotificationName: "Moja {number}. {notification} obavijest",
here: "ovdje",
Required: "Potrebno",
telegram: "Telegram",
@@ -195,11 +195,11 @@ export default {
"YOUR BOT TOKEN HERE": "OVDJE IDE TOKEN BOTA",
chatIDNotFound: "ID razgovora nije pronađen; prvo morate poslati poruku botu",
webhook: "Webhook",
- "Post URL": "Post URL",
+ "Post URL": "URL Post zahtjeva",
"Content Type": "Tip sadržaja (Content Type)",
webhookJsonDesc: "{0} je dobra opcija za moderne HTTP poslužitelje poput Express.js-a",
webhookFormDataDesc: "{multipart} je moguća alternativa za PHP, samo je potrebno parsirati JSON koristeći {decodeFunction}",
- smtp: "E-pošta (SMTP)",
+ smtp: "E-mail (SMTP)",
secureOptionNone: "Bez sigurnosti / STARTTLS (25, 587)",
secureOptionTLS: "TLS (465)",
"Ignore TLS Error": "Ignoriraj greške TLS-a",
@@ -215,7 +215,7 @@ export default {
"Prefix Custom Message": "Prefiks prilagođene poruke",
"Hello @everyone is...": "Pozdrav {'@'}everyone...",
teams: "Microsoft Teams",
- "Webhook URL": "URL Teams webhooka",
+ "Webhook URL": "URL webhooka",
wayToGetTeamsURL: "Više informacija o Teams webhookovima možete pročitati {0}.",
signal: "Signal",
Number: "Broj",
@@ -242,7 +242,7 @@ export default {
promosms: "PromoSMS",
clicksendsms: "ClickSend SMS",
lunasea: "LunaSea",
- apprise: "Apprise (Support 50+ Notification services)",
+ apprise: "Apprise (Podržava preko 50 usluga za obavijesti)",
pushbullet: "Pushbullet",
line: "LINE",
mattermost: "Mattermost",
From c094dc0c5bd36c691869fcdc907ab87d52bf8ea9 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 21:48:46 +0800
Subject: [PATCH 023/142] speed up redirect by using 302 redirect instead of
vue redirect
---
server/server.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/server/server.js b/server/server.js
index 0af003d13..d1fd7ff29 100644
--- a/server/server.js
+++ b/server/server.js
@@ -186,6 +186,15 @@ exports.entryPage = "dashboard";
// Normal Router here
// ***************************
+ // Entry Page
+ app.get("/", async (_request, response) => {
+ if (exports.entryPage === "statusPage") {
+ response.redirect("/status");
+ } else {
+ response.redirect("/dashboard");
+ }
+ });
+
// Robots.txt
app.get("/robots.txt", async (_request, response) => {
let txt = "User-agent: *\nDisallow:";
From e496c3b3be4a2d93332766d687294b41da9f4549 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Tue, 2 Nov 2021 22:03:02 +0800
Subject: [PATCH 024/142] update healthcheck.js
---
extra/healthcheck.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extra/healthcheck.js b/extra/healthcheck.js
index 8044f654f..c6e8a349a 100644
--- a/extra/healthcheck.js
+++ b/extra/healthcheck.js
@@ -35,7 +35,7 @@ let options = {
let request = client.request(options, (res) => {
console.log(`Health Check OK [Res Code: ${res.statusCode}]`);
- if (res.statusCode === 200) {
+ if (res.statusCode === 302) {
process.exit(0);
} else {
process.exit(1);
From e5d6410cafc1afbff3991f37a1ffb69ad45f51f4 Mon Sep 17 00:00:00 2001
From: Jasper Miller-Waugh
Date: Wed, 3 Nov 2021 11:46:53 +1300
Subject: [PATCH 025/142] Apply formatting suggestions from code review
Co-authored-by: Adam Stachowicz
---
server/routers/api-router.js | 4 ++--
src/pages/StatusPage.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index 30f6a828c..79e828378 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -149,7 +149,7 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
for (let groupBean of list) {
let monitorGroup = await groupBean.toPublicJSON();
if (tagsVisible) {
- monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map( async (monitor)=>{
+ monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map(async (monitor) => {
// Includes tags as an array in response, allows for tags to be displayed on public status page
const tags = await R.getAll(
`SELECT monitor_tag.monitor_id, monitor_tag.value, tag.name, tag.color
@@ -158,7 +158,7 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id = ?`, [monitor.id]
);
- return {...monitor,tags: tags}
+ return {...monitor, tags: tags}
}));
}
diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue
index 70367cc9f..ce0f94b55 100644
--- a/src/pages/StatusPage.vue
+++ b/src/pages/StatusPage.vue
@@ -493,10 +493,10 @@ export default {
// On load, the status page will not include tags if it's not enabled for security reasons
// Which means if we enable tags, it won't show in the UI until saved
// So we have this to enhance UX and load in the tags from the authenticated source instantly
- this.$root.publicGroupList = this.$root.publicGroupList.map((group)=>{
+ this.$root.publicGroupList = this.$root.publicGroupList.map((group) => {
return {
...group,
- monitorList: group.monitorList.map((monitor)=> {
+ monitorList: group.monitorList.map((monitor) => {
// We only include the tags if visible so we can reuse the logic to hide the tags on disable
return {
...monitor,
From dee131c25d64d36ad0b7de7cbb46bb61a86c710f Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 3 Nov 2021 13:02:44 +0800
Subject: [PATCH 026/142] fix table hover color not working after updated
bootstrap to 5.1.3
---
src/assets/app.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/assets/app.scss b/src/assets/app.scss
index e1a5d052d..89639fd95 100644
--- a/src/assets/app.scss
+++ b/src/assets/app.scss
@@ -189,7 +189,7 @@ textarea.form-control {
opacity: 1;
}
- .table-hover > tbody > tr:hover {
+ .table-hover > tbody > tr:hover > * {
--bs-table-accent-bg: #070a10;
color: $dark-font-color;
}
From 1ba203470183ee2f741898fa4971b408432d2f2d Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 3 Nov 2021 13:03:36 +0800
Subject: [PATCH 027/142] freeze bootstrap to 5.1.3 to prevent breaking changes
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 64be83ee1..d34531b36 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"args-parser": "~1.3.0",
"axios": "~0.21.4",
"bcryptjs": "~2.4.3",
- "bootstrap": "~5.1.3",
+ "bootstrap": "5.1.3",
"bree": "~6.3.1",
"chardet": "^1.3.0",
"chart.js": "~3.6.0",
From ee2c54cfd1f619541aba35f2e3c2fae60d3fb61f Mon Sep 17 00:00:00 2001
From: MrEddX <66828538+MrEddX@users.noreply.github.com>
Date: Wed, 3 Nov 2021 11:49:22 +0200
Subject: [PATCH 028/142] Update bg-BG.js
- Added New Fields
- Fixed Existing Fields
---
src/languages/bg-BG.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index 0d5af783a..f1d9b0784 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -77,7 +77,7 @@ export default {
"Accepted Status Codes": "Допустими статус кодове",
Save: "Запази",
Notifications: "Известявания",
- "Not available, please setup.": "Не е налично. Моля, настройте.",
+ "Not available, please setup.": "Не са налични. Моля, настройте.",
"Setup Notification": "Настройки за известявания",
Light: "Светла",
Dark: "Тъмна",
@@ -141,7 +141,7 @@ export default {
Overwrite: "Презапиши",
Options: "Опции",
"Keep both": "Запази двете",
- "Verify Token": "Проверка на токен код",
+ "Verify Token": "Провери токен код",
"Setup 2FA": "Настройка 2FA",
"Enable 2FA": "Включи 2FA",
"Disable 2FA": "Изключи 2FA",
@@ -298,8 +298,13 @@ export default {
HeadersInvalidFormat: "Заявените хедъри не са валидни JSON: ",
BodyInvalidFormat: "Заявеното съобщение не е валиден JSON: ",
"Monitor History": "История на мониторите",
- clearDataOlderThan: "Ще се съхранява за {0} дни.",
+ clearDataOlderThan: "Ще се съхранява {0} дни.",
records: "записа",
"One record": "Един запис",
steamApiKeyDescription: "За да мониторирате Steam Gameserver се нуждаете от Steam Web-API ключ. Може да регистрирате Вашия API ключ тук: ",
+ clicksendsms: "ClickSend SMS",
+ apiCredentials: "API удостоверяване",
+ PasswordsDoNotMatch: "Паролите не съвпадат.",
+ "Current User": "Текущ потребител",
+ recent: "Скорошни",
};
From 57389fab2c3588b671cd54d63de95c14d7ec663f Mon Sep 17 00:00:00 2001
From: Nelson Chan
Date: Wed, 3 Nov 2021 19:13:11 +0800
Subject: [PATCH 029/142] Update PULL_REQUEST_TEMPLATE.md
---
.github/PULL_REQUEST_TEMPLATE.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fa0aa883b..c286db021 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,3 +24,5 @@ Please delete options that are not relevant.
- [ ] My code needed automated testing. I have added them (this is optional task)
## Screenshots (if any)
+
+Please do not use any external image service. Instead, just paste in the image here and it will be uploaded automatically.
From 314fa18bdcdab25147d4df3ca3ed754888188e3f Mon Sep 17 00:00:00 2001
From: Adam Stachowicz
Date: Thu, 4 Nov 2021 00:19:04 +0100
Subject: [PATCH 030/142] 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 }}
-
-
-
- {{ telegramGetUpdatesURL }}
-
+ {{ telegramGetUpdatesURL() }}
@@ -40,49 +34,47 @@
From bc5f61b3ec4d29ed7ac99f48eb655be7fd364976 Mon Sep 17 00:00:00 2001
From: Nelson Chan
Date: Thu, 4 Nov 2021 10:21:57 +0800
Subject: [PATCH 031/142] Chore: Add drag and drop
Co-authored-by: Adam Stachowicz
---
.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 c286db021..3be229315 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 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 665c263c03936c063a3528047aa33001ce42801e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Tue, 2 Nov 2021 11:51:45 +0100
Subject: [PATCH 032/142] Add db migrations for new basic auth fields
---
db/patch-monitor-basicauth.sql | 10 ++++++++++
server/database.js | 1 +
2 files changed, 11 insertions(+)
create mode 100644 db/patch-monitor-basicauth.sql
diff --git a/db/patch-monitor-basicauth.sql b/db/patch-monitor-basicauth.sql
new file mode 100644
index 000000000..3a33350d7
--- /dev/null
+++ b/db/patch-monitor-basicauth.sql
@@ -0,0 +1,10 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+ ADD basicauth_user TEXT default null;
+
+ALTER TABLE monitor
+ ADD basicauth_pass TEXT default null;
+
+COMMIT;
diff --git a/server/database.js b/server/database.js
index 41d91e858..cc7247f1c 100644
--- a/server/database.js
+++ b/server/database.js
@@ -52,6 +52,7 @@ class Database {
"patch-http-monitor-method-body-and-headers.sql": true,
"patch-2fa-invalidate-used-token.sql": true,
"patch-notification_sent_history.sql": true,
+ "patch-monitor-basicauth.sql": true,
}
/**
From 23736549f90eb86afcca919e99e06abfe66c3105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Tue, 2 Nov 2021 12:30:44 +0100
Subject: [PATCH 033/142] Implement HTTP basic auth feature
---
server/model/monitor.js | 20 ++++++++++++++++++++
server/server.js | 4 ++++
src/pages/EditMonitor.vue | 10 ++++++++++
3 files changed, 34 insertions(+)
diff --git a/server/model/monitor.js b/server/model/monitor.js
index fc3292317..c80e941e9 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -58,6 +58,8 @@ class Monitor extends BeanModel {
method: this.method,
body: this.body,
headers: this.headers,
+ basicauth_user: this.basicauth_user,
+ basicauth_pass: this.basicauth_pass,
hostname: this.hostname,
port: this.port,
maxretries: this.maxretries,
@@ -80,6 +82,15 @@ class Monitor extends BeanModel {
};
}
+ /**
+ * Encode user and password to Base64 encoding
+ * for HTTP "basic" auth, as per RFC-7617
+ * @returns {string}
+ */
+ encodeB64(user, pass) {
+ return btoa(user + ":" + pass);
+ }
+
/**
* Parse to boolean
* @returns {boolean}
@@ -141,6 +152,14 @@ class Monitor extends BeanModel {
// Do not do any queries/high loading things before the "bean.ping"
let startTime = dayjs().valueOf();
+ // HTTP basic auth
+ let basicauthHeader = {};
+ if (this.basicauth_user) {
+ basicauthHeader = {
+ "Authorization": "Basic " + this.encodeB64(this.basicauth_user, this.basicauth_pass)
+ }
+ }
+
const options = {
url: this.url,
method: (this.method || "get").toLowerCase(),
@@ -150,6 +169,7 @@ class Monitor extends BeanModel {
"Accept": "*/*",
"User-Agent": "Uptime-Kuma/" + version,
...(this.headers ? JSON.parse(this.headers) : {}),
+ ...(basicauthHeader)
},
httpsAgent: new https.Agent({
maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
diff --git a/server/server.js b/server/server.js
index d1fd7ff29..76d456c54 100644
--- a/server/server.js
+++ b/server/server.js
@@ -575,6 +575,8 @@ exports.entryPage = "dashboard";
bean.method = monitor.method;
bean.body = monitor.body;
bean.headers = monitor.headers;
+ bean.basicauth_user = monitor.basicauth_user;
+ bean.basicauth_pass = monitor.basicauth_pass;
bean.interval = monitor.interval;
bean.retryInterval = monitor.retryInterval;
bean.hostname = monitor.hostname;
@@ -1139,6 +1141,8 @@ exports.entryPage = "dashboard";
method: monitorListData[i].method || "GET",
body: monitorListData[i].body,
headers: monitorListData[i].headers,
+ basicauth_user: monitorListData[i].basicauth_user,
+ basicauth_pass: monitorListData[i].basicauth_pass,
interval: monitorListData[i].interval,
retryInterval: retryInterval,
hostname: monitorListData[i].hostname,
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 65c3dad6e..18954968a 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -265,6 +265,15 @@
{{ $t("Headers") }}
+
+
+ {{ $t("HTTP Basic Auth") }}
+
+ {{ $t("Username") }}
+
+ {{ $t("Password") }}
+
+
@@ -487,6 +496,7 @@ export default {
this.monitor.headers = JSON.stringify(JSON.parse(this.monitor.headers), null, 4);
}
+
if (this.isAdd) {
this.$root.add(this.monitor, async (res) => {
From 0dcb7aed21fe9d63ffbdc6c866e0d4cd4485b6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Tue, 2 Nov 2021 13:11:33 +0100
Subject: [PATCH 034/142] Delinting
---
server/model/monitor.js | 6 +++---
src/pages/EditMonitor.vue | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/model/monitor.js b/server/model/monitor.js
index c80e941e9..95ef39336 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -87,9 +87,9 @@ class Monitor extends BeanModel {
* for HTTP "basic" auth, as per RFC-7617
* @returns {string}
*/
- encodeB64(user, pass) {
+ encodeB64(user, pass) {
return btoa(user + ":" + pass);
- }
+ }
/**
* Parse to boolean
@@ -157,7 +157,7 @@ class Monitor extends BeanModel {
if (this.basicauth_user) {
basicauthHeader = {
"Authorization": "Basic " + this.encodeB64(this.basicauth_user, this.basicauth_pass)
- }
+ };
}
const options = {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 18954968a..f5099aa3a 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -266,7 +266,7 @@
-
+
{{ $t("HTTP Basic Auth") }}
{{ $t("Username") }}
@@ -496,7 +496,6 @@ export default {
this.monitor.headers = JSON.stringify(JSON.parse(this.monitor.headers), null, 4);
}
-
if (this.isAdd) {
this.$root.add(this.monitor, async (res) => {
From 179ca232bc85d6a7a0bbedc05d10be5f6e6a003e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Thu, 4 Nov 2021 10:12:06 +0100
Subject: [PATCH 035/142] Minor refactor - change variable names and add commas
to object definitions
---
...-basicauth.sql => patch-monitor-basic-auth.sql} | 4 ++--
server/database.js | 2 +-
server/model/monitor.js | 14 +++++++-------
server/server.js | 8 ++++----
src/pages/EditMonitor.vue | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
rename db/{patch-monitor-basicauth.sql => patch-monitor-basic-auth.sql} (66%)
diff --git a/db/patch-monitor-basicauth.sql b/db/patch-monitor-basic-auth.sql
similarity index 66%
rename from db/patch-monitor-basicauth.sql
rename to db/patch-monitor-basic-auth.sql
index 3a33350d7..de4bdefd9 100644
--- a/db/patch-monitor-basicauth.sql
+++ b/db/patch-monitor-basic-auth.sql
@@ -2,9 +2,9 @@
BEGIN TRANSACTION;
ALTER TABLE monitor
- ADD basicauth_user TEXT default null;
+ ADD basic_auth_user TEXT default null;
ALTER TABLE monitor
- ADD basicauth_pass TEXT default null;
+ ADD basic_auth_pass TEXT default null;
COMMIT;
diff --git a/server/database.js b/server/database.js
index cc7247f1c..dfc739e0a 100644
--- a/server/database.js
+++ b/server/database.js
@@ -52,7 +52,7 @@ class Database {
"patch-http-monitor-method-body-and-headers.sql": true,
"patch-2fa-invalidate-used-token.sql": true,
"patch-notification_sent_history.sql": true,
- "patch-monitor-basicauth.sql": true,
+ "patch-monitor-basic-auth.sql": true,
}
/**
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 95ef39336..f3c823c3b 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -58,8 +58,8 @@ class Monitor extends BeanModel {
method: this.method,
body: this.body,
headers: this.headers,
- basicauth_user: this.basicauth_user,
- basicauth_pass: this.basicauth_pass,
+ basic_auth_user: this.basic_auth_user,
+ basic_auth_pass: this.basic_auth_pass,
hostname: this.hostname,
port: this.port,
maxretries: this.maxretries,
@@ -153,10 +153,10 @@ class Monitor extends BeanModel {
let startTime = dayjs().valueOf();
// HTTP basic auth
- let basicauthHeader = {};
- if (this.basicauth_user) {
- basicauthHeader = {
- "Authorization": "Basic " + this.encodeB64(this.basicauth_user, this.basicauth_pass)
+ let basicAuthHeader = {};
+ if (this.basic_auth_user) {
+ basicAuthHeader = {
+ "Authorization": "Basic " + this.encodeB64(this.basic_auth_user, this.basic_auth_pass),
};
}
@@ -169,7 +169,7 @@ class Monitor extends BeanModel {
"Accept": "*/*",
"User-Agent": "Uptime-Kuma/" + version,
...(this.headers ? JSON.parse(this.headers) : {}),
- ...(basicauthHeader)
+ ...(basicAuthHeader),
},
httpsAgent: new https.Agent({
maxCachedSessions: 0, // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
diff --git a/server/server.js b/server/server.js
index 76d456c54..b1678198a 100644
--- a/server/server.js
+++ b/server/server.js
@@ -575,8 +575,8 @@ exports.entryPage = "dashboard";
bean.method = monitor.method;
bean.body = monitor.body;
bean.headers = monitor.headers;
- bean.basicauth_user = monitor.basicauth_user;
- bean.basicauth_pass = monitor.basicauth_pass;
+ bean.basic_auth_user = monitor.basic_auth_user;
+ bean.basic_auth_pass = monitor.basic_auth_pass;
bean.interval = monitor.interval;
bean.retryInterval = monitor.retryInterval;
bean.hostname = monitor.hostname;
@@ -1141,8 +1141,8 @@ exports.entryPage = "dashboard";
method: monitorListData[i].method || "GET",
body: monitorListData[i].body,
headers: monitorListData[i].headers,
- basicauth_user: monitorListData[i].basicauth_user,
- basicauth_pass: monitorListData[i].basicauth_pass,
+ basic_auth_user: monitorListData[i].basic_auth_user,
+ basic_auth_pass: monitorListData[i].basic_auth_pass,
interval: monitorListData[i].interval,
retryInterval: retryInterval,
hostname: monitorListData[i].hostname,
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index f5099aa3a..8b3157eab 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -270,9 +270,9 @@
{{ $t("HTTP Basic Auth") }}
{{ $t("Username") }}
-
+
{{ $t("Password") }}
-
+
From 0481a241f3905dc23421a41de6b0ca80836f233c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Thu, 4 Nov 2021 10:22:42 +0100
Subject: [PATCH 036/142] Add translated placeholders for editing basic auth
---
src/pages/EditMonitor.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 8b3157eab..108defb74 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -270,9 +270,9 @@
{{ $t("HTTP Basic Auth") }}
{{ $t("Username") }}
-
+
{{ $t("Password") }}
-
+
From 210566c7af9561e2b63571c0649f0352c9a054e1 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Fri, 5 Nov 2021 11:34:50 +0800
Subject: [PATCH 037/142] remove prefix for issue title, so users need to input
the title
---
.github/ISSUE_TEMPLATE/ask-for-help.yaml | 2 +-
.github/ISSUE_TEMPLATE/bug_report.yaml | 2 +-
.github/ISSUE_TEMPLATE/feature_request.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
index 76a78e5c3..3442e8b73 100644
--- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml
+++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml
@@ -1,6 +1,6 @@
name: "❓ Ask for help"
description: "Submit any question related to Uptime Kuma"
-title: "[Help] "
+#title: "[Help] "
labels: [help]
body:
- type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 055c3a626..2dca1556a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,6 @@
name: "🐛 Bug Report"
description: "Submit a bug report to help us improve"
-title: "[Bug] "
+#title: "[Bug] "
labels: [bug]
body:
- type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 6464e276a..f0a92ede1 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,6 +1,6 @@
name: 🚀 Feature Request
description: "Submit a proposal for a new feature"
-title: "[Feature] "
+#title: "[Feature] "
labels: [enhancement]
body:
- type: checkboxes
From 8f44b9f6181dfd80015012cceff227fb1e521c18 Mon Sep 17 00:00:00 2001
From: Andreas Brett
Date: Fri, 5 Nov 2021 09:54:10 +0100
Subject: [PATCH 038/142] 24h tooltip on status page
---
src/components/Uptime.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Uptime.vue b/src/components/Uptime.vue
index a4bf22f68..2717672c4 100644
--- a/src/components/Uptime.vue
+++ b/src/components/Uptime.vue
@@ -1,5 +1,5 @@
- {{ uptime }}
+ {{ uptime }}
+
+
diff --git a/src/components/settings/Appearance.vue b/src/components/settings/Appearance.vue
new file mode 100644
index 000000000..e0a3d6430
--- /dev/null
+++ b/src/components/settings/Appearance.vue
@@ -0,0 +1,149 @@
+
+
+
+
+ {{ $t("Language") }}
+
+
+
+ {{ $i18n.messages[lang].languageName }}
+
+
+
+
+
+
{{ $t("Theme - Heartbeat Bar") }}
+
+
+
+
+
+
+
+
diff --git a/src/components/settings/Backup.vue b/src/components/settings/Backup.vue
new file mode 100644
index 000000000..6ac28d468
--- /dev/null
+++ b/src/components/settings/Backup.vue
@@ -0,0 +1,213 @@
+
+
+
+
{{ $t("Export Backup") }}
+
+
+ {{ $t("backupDescription") }}
+ ({{ $t("backupDescription2") }})
+
+
+
+
+ {{ $t("Export") }}
+
+
+
+
+ {{ $t("backupDescription3") }}
+
+
+
+
+
{{ $t("Import Backup") }}
+
+
{{ $t("Options") }}:
+
+
+
+
+ {{ $t("Keep both") }}
+
+
+
+
+
+ {{ $t("Skip existing") }}
+
+
+
+
+
+ {{ $t("Overwrite") }}
+
+
+
+ {{ $t("importHandleDescription") }}
+
+
+
+
+
+
+
+
+
+ {{ $t("Import") }}
+
+
+
+
+ {{ importAlert }}
+
+
+
+
+ {{ $t("confirmImportMsg") }}
+
+
+
+
+
+
+
diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue
new file mode 100644
index 000000000..308f21aee
--- /dev/null
+++ b/src/components/settings/General.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
diff --git a/src/components/settings/MonitorHistory.vue b/src/components/settings/MonitorHistory.vue
new file mode 100644
index 000000000..85853ea1a
--- /dev/null
+++ b/src/components/settings/MonitorHistory.vue
@@ -0,0 +1,127 @@
+
+
+
+
+ {{
+ $t("clearDataOlderThan", [
+ settings.keepDataPeriodDays,
+ ])
+ }}
+
+
+
+
+
+
+ {{ $t("Shrink Database") }} ({{ databaseSizeDisplay }})
+
+
{{ $t("shrinkDatabaseDescription") }}
+
+
+ {{ $t("Clear all statistics") }}
+
+
+
+ {{ $t("confirmClearStatisticsMsg") }}
+
+
+
+
+
+
+
diff --git a/src/components/settings/Notifications.vue b/src/components/settings/Notifications.vue
new file mode 100644
index 000000000..b2cbcf48a
--- /dev/null
+++ b/src/components/settings/Notifications.vue
@@ -0,0 +1,46 @@
+
+
+
+
+ {{ $t("Not available, please setup.") }}
+
+
+ {{ $t("notificationDescription") }}
+
+
+
+
+
+ {{ $t("Setup Notification") }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/settings/Security.vue b/src/components/settings/Security.vue
new file mode 100644
index 000000000..1cbfb034e
--- /dev/null
+++ b/src/components/settings/Security.vue
@@ -0,0 +1,323 @@
+
+
+
+
+
+
+ {{ $t("Current User") }}: {{ username }}
+
+
+ {{ $t("Change Password") }}
+
+
+
+
+
+ {{ $t("Two Factor Authentication") }}
+
+
+
+ {{ $t("2FA Settings") }}
+
+
+
+
+
+
+
{{ $t("Advanced") }}
+
+
+ {{ $t("Enable Auth") }}
+ {{ $t("Disable Auth") }}
+ {{ $t("Logout") }}
+
+
+
+
+
+
+
+
+ Seguro que deseas deshabilitar la autenticación ?
+ Es para quien implementa autenticación de terceros ante Uptime Kuma como por ejemplo Cloudflare Access.
+ Por favor usar con cuidado.
+
+
+
+ Você tem certeza que deseja desativar a autenticação ?
+ Isso é para alguém que tem autenticação de terceiros na frente do 'UpTime Kuma' como o Cloudflare Access.
+ Por favor, utilize isso com cautela.
+
+
+
+ 你是否確認取消登入認証 ?
+ 這個功能是設計給已有第三方認証 的用家,例如 Cloudflare Access。
+ 請小心使用。
+
+
+
+ 是否确定 取消登录验证 ?
+ 这是为 有第三方认证 的用户提供的功能,如 Cloudflare Access
+ 请谨慎使用!
+
+
+
+ 你是否要取消登入驗證 ?
+ 此功能是設計給已有第三方認證 的使用者,例如 Cloudflare Access。
+ 請謹慎使用。
+
+
+
+ Bist du sicher das du die Authentifizierung deaktivieren möchtest?
+ Es ist für jemanden der eine externe Authentifizierung vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.
+ Bitte mit Vorsicht nutzen.
+
+
+
+ Да ли сте сигурни да желите да искључите аутентификацију ?
+ То је за оне који имају додату аутентификацију испред Uptime Kuma као на пример Cloudflare Access.
+ Молим Вас користите ово са пажњом.
+
+
+
+ Da li ste sigurni da želite da isključite autentifikaciju ?
+ To je za one koji imaju dodatu autentifikaciju ispred Uptime Kuma kao na primer Cloudflare Access.
+ Molim Vas koristite ovo sa pažnjom.
+
+
+
+ Jeste li sigurni da želite isključiti autentikaciju ?
+ To je za korisnike koji imaju vanjsku autentikaciju stranice ispred Uptime Kume, poput usluge Cloudflare Access.
+ Pažljivo koristite ovu opciju.
+
+
+
+ Şifreli girişi devre dışı bırakmak istediğinizden emin misiniz?
+ Bu, Uptime Kuma'nın önünde Cloudflare Access gibi üçüncü taraf yetkilendirmesi olan kişiler içindir.
+ Lütfen dikkatli kullanın.
+
+
+
+ 정말로 인증 기능을 끌까요 ?
+ 이 기능은 Cloudflare Access와 같은 서드파티 인증 을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.
+ 신중하게 사용하세요.
+
+
+
+ Czy na pewno chcesz wyłączyć autoryzację ?
+ Jest przeznaczony dla kogoś, kto ma autoryzację zewnętrzną przed Uptime Kuma, taką jak Cloudflare Access.
+ Proszę używać ostrożnie.
+
+
+
+ Kas soovid lülitada autentimise välja ?
+ Kastuamiseks välise autentimispakkujaga , näiteks Cloudflare Access.
+ Palun kasuta vastutustundlikult.
+
+
+
+ Si è certi di voler disabilitare l'autenticazione ?
+ È per chi ha l'autenticazione gestita da terze parti messa davanti ad Uptime Kuma, ad esempio Cloudflare Access.
+ Utilizzare con attenzione.
+
+
+
+ Apakah Anda yakin ingin menonaktifkan autentikasi ?
+ Ini untuk mereka yang memiliki autentikasi pihak ketiga diletakkan di depan Uptime Kuma, misalnya akses Cloudflare.
+ Gunakan dengan hati-hati.
+
+
+
+ Вы уверены, что хотите отключить авторизацию ?
+ Это подходит для тех, у кого стоит другая авторизация перед открытием Uptime Kuma, например Cloudflare Access.
+ Пожалуйста, используйте с осторожностью.
+
+
+
+ آیا مطمئن هستید که میخواهید احراز هویت را غیر فعال کنید ?
+ این ویژگی برای کسانی است که لایه امنیتی شخص ثالث دیگر بر روی این آدرس فعال کردهاند ، مانند Cloudflare Access.
+ لطفا از این امکان با دقت استفاده کنید.
+
+
+
+ Сигурни ли сте, че желаете да изключите удостоверяването ?
+ Използва се в случаите, когато има настроен алтернативен метод за удостоверяване преди Uptime Kuma, например Cloudflare Access.
+ Моля, използвайте с повишено внимание.
+
+
+
+ Biztos benne, hogy kikapcsolja a hitelesítést ?
+ Akkor érdemes, ha van 3rd-party hitelesítés az Uptime Kuma-t megelőzően mint a Cloudflare Access.
+ Használja megfontoltan!
+
+
+
+ Er du sikker på at du vil deaktiver autentisering ?
+ Dette er for de som har tredjepartsautorisering foran Uptime Kuma, for eksempel Cloudflare Access.
+ Vennligst vær forsiktig.
+
+
+
+
+ Are you sure want to disable auth ?
+ It is for someone who have 3rd-party auth in front of Uptime Kuma such as Cloudflare Access.
+ Please use it carefully.
+
+
+
+
+
+
+
+
diff --git a/src/languages/en.js b/src/languages/en.js
index 15c3cd0f3..a503b5235 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -307,4 +307,5 @@ 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",
+ shrinkDatabaseDescription: "Trigger database VACCUM for SQLite. If your database is created after 1.10.0, AUTO_VACCUM is already enabled and this action is not needed.",
};
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 7228a460d..2f4f689ab 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -188,8 +188,8 @@ main {
.dark {
header {
- background-color: #161b22;
- border-bottom-color: #161b22 !important;
+ background-color: $dark-header-bg;
+ border-bottom-color: $dark-header-bg !important;
span {
color: #f0f6fc;
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 9d501407d..9ff234150 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -7,521 +7,90 @@
-
-
{{ $t("Appearance") }}
-
-
- {{ $t("Language") }}
-
-
- {{ $i18n.messages[lang].languageName }}
-
-
-
-
-
-
{{ $t("Theme") }}
-
-
-
-
-
-
{{ $t("Theme - Heartbeat Bar") }}
-
+
-
-
-
-
-
-
-
{{ $t("Notifications") }}
-
- {{ $t("Not available, please setup.") }}
-
-
- {{ $t("notificationDescription") }}
-
-
-
-
-
- {{ $t("Setup Notification") }}
-
+
+
+
+
-
-
-
{{ $t("Info") }}
-
- {{ $t("Version") }}: {{ $root.info.version }}
-
{{ $t("Check Update On GitHub") }}
-
-
-
-
-
-
- Seguro que deseas deshabilitar la autenticación ?
- Es para quien implementa autenticación de terceros ante Uptime Kuma como por ejemplo Cloudflare Access.
- Por favor usar con cuidado.
-
-
-
- Você tem certeza que deseja desativar a autenticação ?
- Isso é para alguém que tem autenticação de terceiros na frente do 'UpTime Kuma' como o Cloudflare Access.
- Por favor, utilize isso com cautela.
-
-
-
- 你是否確認取消登入認証 ?
- 這個功能是設計給已有第三方認証 的用家,例如 Cloudflare Access。
- 請小心使用。
-
-
-
- 是否确定 取消登录验证 ?
- 这是为 有第三方认证 的用户提供的功能,如 Cloudflare Access
- 请谨慎使用!
-
-
-
- 你是否要取消登入驗證 ?
- 此功能是設計給已有第三方認證 的使用者,例如 Cloudflare Access。
- 請謹慎使用。
-
-
-
- Bist du sicher das du die Authentifizierung deaktivieren möchtest?
- Es ist für jemanden der eine externe Authentifizierung vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.
- Bitte mit Vorsicht nutzen.
-
-
-
- Да ли сте сигурни да желите да искључите аутентификацију ?
- То је за оне који имају додату аутентификацију испред Uptime Kuma као на пример Cloudflare Access.
- Молим Вас користите ово са пажњом.
-
-
-
- Da li ste sigurni da želite da isključite autentifikaciju ?
- To je za one koji imaju dodatu autentifikaciju ispred Uptime Kuma kao na primer Cloudflare Access.
- Molim Vas koristite ovo sa pažnjom.
-
-
-
- Jeste li sigurni da želite isključiti autentikaciju ?
- To je za korisnike koji imaju vanjsku autentikaciju stranice ispred Uptime Kume, poput usluge Cloudflare Access.
- Pažljivo koristite ovu opciju.
-
-
-
- Şifreli girişi devre dışı bırakmak istediğinizden emin misiniz?
- Bu, Uptime Kuma'nın önünde Cloudflare Access gibi üçüncü taraf yetkilendirmesi olan kişiler içindir.
- Lütfen dikkatli kullanın.
-
-
-
- 정말로 인증 기능을 끌까요 ?
- 이 기능은 Cloudflare Access와 같은 서드파티 인증 을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.
- 신중하게 사용하세요.
-
-
-
- Czy na pewno chcesz wyłączyć autoryzację ?
- Jest przeznaczony dla kogoś, kto ma autoryzację zewnętrzną przed Uptime Kuma, taką jak Cloudflare Access.
- Proszę używać ostrożnie.
-
-
-
- Kas soovid lülitada autentimise välja ?
- Kastuamiseks välise autentimispakkujaga , näiteks Cloudflare Access.
- Palun kasuta vastutustundlikult.
-
-
-
- Si è certi di voler disabilitare l'autenticazione ?
- È per chi ha l'autenticazione gestita da terze parti messa davanti ad Uptime Kuma, ad esempio Cloudflare Access.
- Utilizzare con attenzione.
-
-
-
- Apakah Anda yakin ingin menonaktifkan autentikasi ?
- Ini untuk mereka yang memiliki autentikasi pihak ketiga diletakkan di depan Uptime Kuma, misalnya akses Cloudflare.
- Gunakan dengan hati-hati.
-
-
-
- Вы уверены, что хотите отключить авторизацию ?
- Это подходит для тех, у кого стоит другая авторизация перед открытием Uptime Kuma, например Cloudflare Access.
- Пожалуйста, используйте с осторожностью.
-
-
-
- آیا مطمئن هستید که میخواهید احراز هویت را غیر فعال کنید ?
- این ویژگی برای کسانی است که لایه امنیتی شخص ثالث دیگر بر روی این آدرس فعال کردهاند ، مانند Cloudflare Access.
- لطفا از این امکان با دقت استفاده کنید.
-
-
-
- Сигурни ли сте, че желаете да изключите удостоверяването ?
- Използва се в случаите, когато има настроен алтернативен метод за удостоверяване преди Uptime Kuma, например Cloudflare Access.
- Моля, използвайте с повишено внимание.
-
-
-
- Biztos benne, hogy kikapcsolja a hitelesítést ?
- Akkor érdemes, ha van 3rd-party hitelesítés az Uptime Kuma-t megelőzően mint a Cloudflare Access.
- Használja megfontoltan!
-
-
-
- Er du sikker på at du vil deaktiver autentisering ?
- Dette er for de som har tredjepartsautorisering foran Uptime Kuma, for eksempel Cloudflare Access.
- Vennligst vær forsiktig.
-
-
-
-
- Are you sure want to disable auth ?
- It is for someone who have 3rd-party auth in front of Uptime Kuma such as Cloudflare Access.
- Please use it carefully.
-
-
-
-
- {{ $t("confirmClearStatisticsMsg") }}
-
-
- {{ $t("confirmImportMsg") }}
-
@@ -667,44 +126,66 @@ export default {
.shadow-box {
padding: 20px;
+ min-height: calc(100vh - 155px);
+ max-height: calc(100vh - 30px);
}
-.btn-check:active + .btn-outline-primary,
-.btn-check:checked + .btn-outline-primary,
-.btn-check:hover + .btn-outline-primary {
- color: #fff;
+footer {
+ color: #aaa;
+ font-size: 13px;
+ margin-top: 20px;
+ padding-bottom: 30px;
+ text-align: center;
}
-.dark {
- .list-group-item {
- background-color: $dark-bg2;
- color: $dark-font-color;
- }
+.settings-menu {
+ flex: 0 0 auto;
+ width: 300px;
- .btn-check:active + .btn-outline-primary,
- .btn-check:checked + .btn-outline-primary,
- .btn-check:hover + .btn-outline-primary {
- color: #000;
+ .menu-item {
+ border-radius: 10px;
+ margin: 0.5em;
+ padding: 0.7em 1em;
+ cursor: pointer;
}
- #importBackup {
- &::file-selector-button {
- color: $primary;
- background-color: $dark-bg;
+ .menu-item:hover {
+ background: $highlight-white;
+
+ .dark & {
+ background: $dark-header-bg;
}
+ }
- &:hover:not(:disabled):not([readonly])::file-selector-button {
- color: $dark-font-color2;
- background-color: $primary;
+ .menu-item.active {
+ background: $highlight-white;
+ border-left: 4px solid $primary;
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+
+ .dark & {
+ background: $dark-header-bg;
}
}
}
-footer {
- color: #aaa;
- font-size: 13px;
- margin-top: 20px;
- padding-bottom: 30px;
- text-align: center;
+.settings-content {
+ flex: 0 0 auto;
+ width: calc(100% - 300px);
+
+ .settings-content-header {
+ width: calc(100% + 20px);
+ border-bottom: 1px solid #dee2e6;
+ border-radius: 0 10px 0 0;
+ margin-top: -20px;
+ margin-right: -20px;
+ padding: 12.5px 1em;
+ font-size: 26px;
+
+ .dark & {
+ background: $dark-header-bg;
+ border-bottom: 0;
+ }
+ }
}
From 369cad90c1c2e938a7651947dbffaed6bd2ebd4f Mon Sep 17 00:00:00 2001
From: Nelson Chan
Date: Wed, 3 Nov 2021 17:03:40 +0800
Subject: [PATCH 078/142] WIP: Convert to use vue-router & improve layout
WIP: Fix security page & improve layout
WIP: Fix displaying current page
UI: Improve spacing
Chore: Improve styling
---
src/components/settings/General.vue | 6 +--
src/components/settings/MonitorHistory.vue | 8 ++--
src/components/settings/Security.vue | 10 ++---
src/pages/Settings.vue | 51 ++++++++++------------
src/router.js | 46 +++++++++++++++++++
5 files changed, 82 insertions(+), 39 deletions(-)
diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue
index 308f21aee..a1b42d85f 100644
--- a/src/components/settings/General.vue
+++ b/src/components/settings/General.vue
@@ -163,13 +163,13 @@ export default {
computed: {
settings() {
- return this.$parent.$parent.settings;
+ return this.$parent.$parent.$parent.settings;
},
saveSettings() {
- return this.$parent.$parent.saveSettings;
+ return this.$parent.$parent.$parent.saveSettings;
},
settingsLoaded() {
- return this.$parent.$parent.settingsLoaded;
+ return this.$parent.$parent.$parent.settingsLoaded;
},
guessTimezone() {
return dayjs.tz.guess();
diff --git a/src/components/settings/MonitorHistory.vue b/src/components/settings/MonitorHistory.vue
index 85853ea1a..95efff0e2 100644
--- a/src/components/settings/MonitorHistory.vue
+++ b/src/components/settings/MonitorHistory.vue
@@ -23,7 +23,7 @@
{{ $t("Shrink Database") }} ({{ databaseSizeDisplay }})
- {{ $t("shrinkDatabaseDescription") }}
+ {{ $t("shrinkDatabaseDescription") }}
{{ $t("Current User") }}: {{ username }}
+ {{ $t("Logout") }}
{{ $t("Change Password") }}
@@ -60,7 +61,7 @@
-
+
{{ $t("Two Factor Authentication") }}
@@ -82,7 +83,6 @@
{{ $t("Enable Auth") }}
{{ $t("Disable Auth") }}
- {{ $t("Logout") }}
@@ -244,13 +244,13 @@ export default {
computed: {
settings() {
- return this.$parent.$parent.settings;
+ return this.$parent.$parent.$parent.settings;
},
saveSettings() {
- return this.$parent.$parent.saveSettings;
+ return this.$parent.$parent.$parent.saveSettings;
},
settingsLoaded() {
- return this.$parent.$parent.settingsLoaded;
+ return this.$parent.$parent.$parent.settingsLoaded;
}
},
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 9ff234150..0cff13678 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -8,21 +8,25 @@
@@ -32,16 +36,6 @@
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 4b51569a2..9ade03a14 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -22,6 +22,7 @@ import Matrix from "./Matrix.vue";
import AliyunSMS from "./AliyunSms.vue";
import DingDing from "./DingDing.vue";
import Bark from "./Bark.vue";
+import SerwerSMS from "./SerwerSMS.vue";
/**
* Manage all notification form.
@@ -52,7 +53,8 @@ const NotificationFormList = {
"mattermost": Mattermost,
"matrix": Matrix,
"DingDing": DingDing,
- "Bark": Bark
+ "Bark": Bark,
+ "serwersms": SerwerSMS
}
export default NotificationFormList
diff --git a/src/languages/en.js b/src/languages/en.js
index 0667509f3..a6ad95101 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -308,4 +308,9 @@ export default {
"Current User": "Current User",
recent: "Recent",
shrinkDatabaseDescription: "Trigger database VACUUM for SQLite. If your database is created after 1.10.0, AUTO_VACUUM is already enabled and this action is not needed.",
+ serwersms: "SerwerSMS.pl",
+ serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
+ serwersmsAPIPassword: "API Password",
+ serwersmsPhoneNumber: "Phone number",
+ serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
};
diff --git a/src/languages/pl.js b/src/languages/pl.js
index 082980d3b..9c11a3232 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -307,4 +307,9 @@ export default {
recent: "Ostatnie",
clicksendsms: "ClickSend SMS",
apiCredentials: "Poświadczenia API",
+ serwersms: "SerwerSMS.pl",
+ serwersmsAPIUser: "Nazwa Użytkownika API (z prefiksem webapi_)",
+ serwersmsAPIPassword: "Hasło API",
+ serwersmsPhoneNumber: "Numer Telefonu",
+ serwersmsSenderName: "Nazwa Nadawcy (zatwierdzona w panelu klienta)",
};
From 50593f3edf7a86688bc2b1ba0a57c1589db21980 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Fri, 26 Nov 2021 16:31:19 +0800
Subject: [PATCH 096/142] [wip] lazy load language file
---
src/components/settings/Appearance.vue | 10 +--
src/i18n.js | 89 +++++++++++---------------
src/main.js | 2 +
src/mixins/lang.js | 27 ++++++++
4 files changed, 67 insertions(+), 61 deletions(-)
create mode 100644 src/mixins/lang.js
diff --git a/src/components/settings/Appearance.vue b/src/components/settings/Appearance.vue
index e0a3d6430..63fbd40bc 100644
--- a/src/components/settings/Appearance.vue
+++ b/src/components/settings/Appearance.vue
@@ -4,7 +4,7 @@
{{ $t("Language") }}
-
+
diff --git a/src/i18n.js b/src/i18n.js
index deeeac91e..229493938 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -1,62 +1,45 @@
import { createI18n } from "vue-i18n/index";
-import daDK from "./languages/da-DK";
-import deDE from "./languages/de-DE";
import en from "./languages/en";
-import esEs from "./languages/es-ES";
-import etEE from "./languages/et-EE";
-import fa from "./languages/fa";
-import frFR from "./languages/fr-FR";
-import hu from "./languages/hu";
-import hrHR from "./languages/hr-HR";
-import itIT from "./languages/it-IT";
-import idID from "./languages/id-ID";
-import ja from "./languages/ja";
-import koKR from "./languages/ko-KR";
-import nlNL from "./languages/nl-NL";
-import nbNO from "./languages/nb-NO";
-import pl from "./languages/pl";
-import ptBR from "./languages/pt-BR";
-import bgBG from "./languages/bg-BG";
-import ruRU from "./languages/ru-RU";
-import sr from "./languages/sr";
-import srLatn from "./languages/sr-latn";
-import svSE from "./languages/sv-SE";
-import trTR from "./languages/tr-TR";
-import vi from "./languages/vi";
-import zhCN from "./languages/zh-CN";
-import zhHK from "./languages/zh-HK";
-import zhTW from "./languages/zh-TW";
const languageList = {
+ "zh-HK": "繁體中文 (香港)",
+ "bg-BG": "Български",
+ "de-DE": "Deutsch (Deutschland)",
+ "nl-NL": "Nederlands",
+ "nb-NO": "Norsk",
+ "es-ES": "Español",
+ "fa": "Farsi",
+ "pt-BR": "Português (Brasileiro)",
+ "fr-FR": "Français (France)",
+ "hu": "Magyar",
+ "hr-HR": "Hrvatski",
+ "it-IT": "Italiano (Italian)",
+ "id-ID": "Bahasa Indonesia (Indonesian)",
+ "ja": "日本語",
+ "da-DK": "Danish (Danmark)",
+ "sr": "Српски",
+ "sr-latn": "Srpski",
+ "sv-SE": "Svenska",
+ "tr-TR": "Türkçe",
+ "ko-KR": "한국어",
+ "ru-RU": "Русский",
+ "zh-CN": "简体中文",
+ "pl": "Polski",
+ "et-EE": "eesti",
+ "vi": "Vietnamese",
+ "zh-TW": "繁體中文 (台灣)"
+};
+
+let messages = {
en,
- "zh-HK": zhHK,
- "bg-BG": bgBG,
- "de-DE": deDE,
- "nl-NL": nlNL,
- "nb-NO": nbNO,
- "es-ES": esEs,
- "fa": fa,
- "pt-BR": ptBR,
- "fr-FR": frFR,
- "hu": hu,
- "hr-HR": hrHR,
- "it-IT": itIT,
- "id-ID" : idID,
- "ja": ja,
- "da-DK": daDK,
- "sr": sr,
- "sr-latn": srLatn,
- "sv-SE": svSE,
- "tr-TR": trTR,
- "ko-KR": koKR,
- "ru-RU": ruRU,
- "zh-CN": zhCN,
- "pl": pl,
- "et-EE": etEE,
- "vi": vi,
- "zh-TW": zhTW
};
+for (let lang in languageList) {
+ messages[lang] = {
+ languageName: languageList[lang]
+ };
+}
+
const rtlLangs = ["fa"];
export const currentLocale = () => localStorage.locale
@@ -73,5 +56,5 @@ export const i18n = createI18n({
fallbackLocale: "en",
silentFallbackWarn: true,
silentTranslationWarn: true,
- messages: languageList,
+ messages: messages,
});
diff --git a/src/main.js b/src/main.js
index 14b87f49d..184909081 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@ import mobile from "./mixins/mobile";
import publicMixin from "./mixins/public";
import socket from "./mixins/socket";
import theme from "./mixins/theme";
+import lang from "./mixins/lang";
import { router } from "./router";
import { appName } from "./util.ts";
@@ -22,6 +23,7 @@ const app = createApp({
mobile,
datetime,
publicMixin,
+ lang,
],
data() {
return {
diff --git a/src/mixins/lang.js b/src/mixins/lang.js
new file mode 100644
index 000000000..2a13fec28
--- /dev/null
+++ b/src/mixins/lang.js
@@ -0,0 +1,27 @@
+import { currentLocale } from "../i18n";
+import { setPageLocale } from "../util-frontend";
+const langModules = import.meta.glob("../languages/*.js");
+
+export default {
+ data() {
+ return {
+ language: currentLocale(),
+ };
+ },
+
+ watch: {
+ async language(lang) {
+ await this.changeLang(lang);
+ },
+ },
+
+ methods: {
+ async changeLang(lang) {
+ let message = (await langModules["../languages/" + lang + ".js"]()).default;
+ this.$i18n.setLocaleMessage(lang, message);
+ this.$i18n.locale = lang;
+ localStorage.locale = lang;
+ setPageLocale();
+ }
+ }
+};
From 4888c97d865d63d1a892f5afffdc6276b38e5ee7 Mon Sep 17 00:00:00 2001
From: Ioma Taani
Date: Fri, 26 Nov 2021 10:33:15 +0100
Subject: [PATCH 097/142] Better translation
---
src/languages/it-IT.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 6f4626fe7..5b1c6b8bd 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...",
From 4d947d93744392e816b7942e413943a7a09959b5 Mon Sep 17 00:00:00 2001
From: Ioma Taani
Date: Fri, 26 Nov 2021 10:37:42 +0100
Subject: [PATCH 098/142] better translation
---
src/languages/it-IT.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 5b1c6b8bd..0011e33d8 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -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.",
From 186c11540f800160abcb9624dba7a9e3f8e7f5bb Mon Sep 17 00:00:00 2001
From: kffl
Date: Sat, 27 Nov 2021 13:16:17 +0100
Subject: [PATCH 099/142] style(serwersms): add missing trailing commas
Co-authored-by: Adam Stachowicz
---
server/notification-providers/serwersms.js | 2 +-
src/components/notifications/index.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/notification-providers/serwersms.js b/server/notification-providers/serwersms.js
index 9f75982fe..14fe691a8 100644
--- a/server/notification-providers/serwersms.js
+++ b/server/notification-providers/serwersms.js
@@ -19,7 +19,7 @@ class SerwerSMS extends NotificationProvider {
"password": notification.serwersmsPassword,
"phone": notification.serwersmsPhoneNumber,
"text": msg.replace(/[^\x00-\x7F]/g, ""),
- "sender": notification.serwersmsSenderName
+ "sender": notification.serwersmsSenderName,
};
let resp = await axios.post("https://api2.serwersms.pl/messages/send_sms", data, config);
diff --git a/src/components/notifications/index.js b/src/components/notifications/index.js
index 9ade03a14..bb71fba09 100644
--- a/src/components/notifications/index.js
+++ b/src/components/notifications/index.js
@@ -54,7 +54,7 @@ const NotificationFormList = {
"matrix": Matrix,
"DingDing": DingDing,
"Bark": Bark,
- "serwersms": SerwerSMS
+ "serwersms": SerwerSMS,
}
export default NotificationFormList
From 64ec7664238e861d9db6e63cfdb56c5d7525ebeb Mon Sep 17 00:00:00 2001
From: kffl
Date: Sat, 27 Nov 2021 13:22:54 +0100
Subject: [PATCH 100/142] translate(serwersms): fix pl translation
capitalization
Co-authored-by: Adam Stachowicz
---
src/languages/pl.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/languages/pl.js b/src/languages/pl.js
index 9c11a3232..69d68193e 100644
--- a/src/languages/pl.js
+++ b/src/languages/pl.js
@@ -308,8 +308,8 @@ export default {
clicksendsms: "ClickSend SMS",
apiCredentials: "Poświadczenia API",
serwersms: "SerwerSMS.pl",
- serwersmsAPIUser: "Nazwa Użytkownika API (z prefiksem webapi_)",
+ serwersmsAPIUser: "Nazwa użytkownika API (z prefiksem webapi_)",
serwersmsAPIPassword: "Hasło API",
- serwersmsPhoneNumber: "Numer Telefonu",
- serwersmsSenderName: "Nazwa Nadawcy (zatwierdzona w panelu klienta)",
+ serwersmsPhoneNumber: "Numer telefonu",
+ serwersmsSenderName: "Nazwa nadawcy (zatwierdzona w panelu klienta)",
};
From a284703d9ee3d0bdb3f86a2e900e35dbee6ec9b6 Mon Sep 17 00:00:00 2001
From: MrEddX <66828538+MrEddX@users.noreply.github.com>
Date: Sun, 28 Nov 2021 07:11:20 +0200
Subject: [PATCH 101/142] Update bg-BG.js
- Fixed existing field
- Added new field
- Translated new field
---
src/languages/bg-BG.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/languages/bg-BG.js b/src/languages/bg-BG.js
index f1d9b0784..3ae95b360 100644
--- a/src/languages/bg-BG.js
+++ b/src/languages/bg-BG.js
@@ -89,7 +89,7 @@ export default {
Timezone: "Часова зона",
"Search Engine Visibility": "Видимост за търсачки",
"Allow indexing": "Разреши индексиране",
- "Discourage search engines from indexing site": "Обезкуражи индексирането на сайта от търсачките",
+ "Discourage search engines from indexing site": "Не позволявай на търсачките да индексират този сайт",
"Change Password": "Промени парола",
"Current Password": "Текуща парола",
"New Password": "Нова парола",
@@ -307,4 +307,5 @@ export default {
PasswordsDoNotMatch: "Паролите не съвпадат.",
"Current User": "Текущ потребител",
recent: "Скорошни",
+ shrinkDatabaseDescription: "Инициира \"VACUUM\" за \"SQLite\" база данни. Ако Вашата база данни е създадена след версия 1.10.0, \"AUTO_VACUUM\" функцията е активна и това действие не нужно.",
};
From c50b2b636ae84863272f9e86cd1bc58b71777832 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 16:45:52 +0800
Subject: [PATCH 102/142] [lazy load lang] load the language file on create
---
src/mixins/lang.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/mixins/lang.js b/src/mixins/lang.js
index 2a13fec28..31d5a8e0b 100644
--- a/src/mixins/lang.js
+++ b/src/mixins/lang.js
@@ -9,6 +9,12 @@ export default {
};
},
+ async created() {
+ if (this.language !== "en") {
+ await this.changeLang(this.language);
+ }
+ },
+
watch: {
async language(lang) {
await this.changeLang(lang);
From aea128a85b3cb3a41de40cac7ebf1992bdfb434e Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 16:50:00 +0800
Subject: [PATCH 103/142] make settings' menu reactive
---
src/pages/Settings.vue | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index bacda3a38..3378a0e91 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -44,8 +44,20 @@ export default {
settings: {},
settingsLoaded: false,
+ };
+ },
+
+ computed: {
+ currentPage() {
+ let pathEnd = useRoute().path.split("/").at(-1);
+ if (pathEnd == "settings" || pathEnd == null) {
+ return "general";
+ }
+ return pathEnd;
+ },
- subMenus: {
+ subMenus() {
+ return {
general: {
title: this.$t("General"),
},
@@ -67,17 +79,7 @@ export default {
about: {
title: this.$t("About"),
},
- },
- };
- },
-
- computed: {
- currentPage() {
- let pathEnd = useRoute().path.split("/").at(-1);
- if (pathEnd == "settings" || pathEnd == null) {
- return "general";
- }
- return pathEnd;
+ };
},
},
From 077f3837d9a5968d4395647b290d99a3d2748959 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 16:53:00 +0800
Subject: [PATCH 104/142] update language guide
---
src/languages/README.md | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/languages/README.md b/src/languages/README.md
index 52b70fa84..945fc2078 100644
--- a/src/languages/README.md
+++ b/src/languages/README.md
@@ -5,10 +5,7 @@
3. Run `npm run update-language-files`. You can also use this command to check if there are new strings to translate for your language.
4. Your language file should be filled in. You can translate now.
5. Translate `src/components/settings/Security.vue` (search for a `Confirm` component with `rel="confirmDisableAuth"`).
-6. Import your language file in `src/i18n.js` and add it to `languageList` constant.
+6. Add it into `languageList` constant.
7. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done.
-One of good examples:
-https://github.com/louislam/uptime-kuma/pull/316/files
-
If you do not have programming skills, let me know in [Issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏
From a864b72e0355a2908f6a955ed37c203040aae7eb Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 17:19:55 +0800
Subject: [PATCH 105/142] fix pushover for general message
---
server/notification-providers/pushover.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/notification-providers/pushover.js b/server/notification-providers/pushover.js
index 77ef1a3f0..52d13eef7 100644
--- a/server/notification-providers/pushover.js
+++ b/server/notification-providers/pushover.js
@@ -7,12 +7,12 @@ class Pushover extends NotificationProvider {
async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
let okMsg = "Sent Successfully.";
- let pushoverlink = "https://api.pushover.net/1/messages.json"
+ let pushoverlink = "https://api.pushover.net/1/messages.json";
try {
if (heartbeatJSON == null) {
let data = {
- "message": "Uptime Kuma Pushover testing successful. ",
+ "message": msg,
"user": notification.pushoveruserkey,
"token": notification.pushoverapptoken,
"sound": notification.pushoversounds,
@@ -21,8 +21,8 @@ class Pushover extends NotificationProvider {
"retry": "30",
"expire": "3600",
"html": 1,
- }
- await axios.post(pushoverlink, data)
+ };
+ await axios.post(pushoverlink, data);
return okMsg;
}
@@ -36,11 +36,11 @@ class Pushover extends NotificationProvider {
"retry": "30",
"expire": "3600",
"html": 1,
- }
- await axios.post(pushoverlink, data)
+ };
+ await axios.post(pushoverlink, data);
return okMsg;
} catch (error) {
- this.throwGeneralAxiosError(error)
+ this.throwGeneralAxiosError(error);
}
}
From 6cd130de389e8eec6c1fff21b9e985f9f179d59c Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 17:20:12 +0800
Subject: [PATCH 106/142] minor
---
src/components/settings/General.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/settings/General.vue b/src/components/settings/General.vue
index a1b42d85f..459bb8d5d 100644
--- a/src/components/settings/General.vue
+++ b/src/components/settings/General.vue
@@ -122,6 +122,7 @@
{{ $t("steamApiKeyDescription") }}
From bf8dbd78b304ea0aa5a92bbb4aafe5b0011828c0 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 29 Nov 2021 17:25:30 +0800
Subject: [PATCH 107/142] temporary disable test for settings page
---
test/e2e.spec.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/e2e.spec.js b/test/e2e.spec.js
index 66bbb794b..d4835d1cf 100644
--- a/test/e2e.spec.js
+++ b/test/e2e.spec.js
@@ -83,6 +83,7 @@ describe("Init", () => {
});
// Settings Page
+ /*
describe("Settings", () => {
beforeEach(async () => {
await page.goto(baseURL + "/settings");
@@ -261,6 +262,7 @@ describe("Init", () => {
// }, { timeout: 3000 });
// });
});
+ */
/*
* TODO
From 9c5466890e0ce567d0346c3a27e930c65d173543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Bratovi=C4=87?=
Date: Mon, 29 Nov 2021 12:40:53 +0100
Subject: [PATCH 108/142] Revert "Replace body and header placeholder functions
with translations"
This reverts commit 2c85491ee011ca7f7ba655592eb292b2aa5733c7.
---
src/languages/en.js | 2 --
src/pages/EditMonitor.vue | 18 ++++++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/languages/en.js b/src/languages/en.js
index f7a637de6..24de7410f 100644
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -315,8 +315,6 @@ export default {
"Pick a RR-Type...": "Pick a RR-Type...",
"Pick Accepted Status Codes...": "Pick Accepted Status Codes...",
Default: "Default",
- headersPlaceholder: "Example:\n{\n \"HeaderName\": \"HeaderValue\"\n}",
- bodyPlaceholder: "Example:\n{\n \"key\": \"value\"\n}",
"HTTP Options": "HTTP Options",
"Create Incident": "Create Incident",
Title: "Title",
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 07bd818ef..2678a94af 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -257,13 +257,13 @@
{{ $t("Body") }}
-
+
{{ $t("Headers") }}
-
+
@@ -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 109/142] 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 110/142] 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 111/142] 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 112/142] 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 113/142] 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 114/142] 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 @@
+
+
+
{{ $t("Webhook URL") }}*
+
+
+
+
+
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 115/142] 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 116/142] 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 117/142] 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 118/142] 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 120eb0d85f64624234524c6102653b0fbdca9ef3 Mon Sep 17 00:00:00 2001
From: Ioma Taani
Date: Thu, 2 Dec 2021 12:51:10 +0100
Subject: [PATCH 119/142] aggiornato
---
src/languages/it-IT.js | 43 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 0011e33d8..4b035d4cb 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -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 8f3ef734bc623c5d2aa8da68c813af5af5ab4f0f Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Fri, 3 Dec 2021 01:31:19 +0800
Subject: [PATCH 120/142] 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 121/142] 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 122/142] 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 123/142] 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 124/142] 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 125/142] 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 126/142] 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 19d2db6c8c99e5039656dfc01affb485aa430f88 Mon Sep 17 00:00:00 2001
From: Ioma Taani
Date: Sat, 4 Dec 2021 11:19:56 +0100
Subject: [PATCH 127/142] better translation
---
src/languages/it-IT.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index 4b035d4cb..f76a3581c 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -134,7 +134,7 @@ export default {
"Clear Data": "Cancella dati",
Events: "Eventi",
Heartbeats: "Controlli",
- "Auto Get": "Auto Get",
+ "Auto Get": "Rileva",
backupDescription: "È possibile fare il backup di tutti i monitoraggi e di tutte le notifiche in un file JSON.",
backupDescription2: "P.S.: lo storico e i dati relativi agli eventi non saranno inclusi",
backupDescription3: "Dati sensibili come i token di autenticazione saranno inclusi nel backup, tenere quindi in un luogo sicuro.",
@@ -156,11 +156,11 @@ export default {
Token: "Token",
"Show URI": "Mostra URI",
Tags: "Etichette",
- "Add New below or Select...": "Aggiungine una oppure scegli...",
+ "Add New below or Select...": "Aggiungi oppure scegli...",
"Tag with this name already exist.": "Un'etichetta con questo nome già esiste.",
"Tag with this value already exist.": "Un'etichetta con questo valore già esiste.",
- color: "colori",
- "value (optional)": "valore (opzionale)",
+ color: "colore",
+ "value (optional)": "descrizione (opzionale)",
Gray: "Grigio",
Red: "Rosso",
Orange: "Arancione",
@@ -170,8 +170,8 @@ export default {
Purple: "Viola",
Pink: "Rosa",
"Search...": "Cerca...",
- "Avg. Ping": "Tempo di risposta al ping medio",
- "Avg. Response": "Tempo di risposta medio",
+ "Avg. Ping": "Tempo medio di risposta al ping",
+ "Avg. Response": "Tempo medio di risposta",
"Entry Page": "Pagina Principale",
statusPageNothing: "Non c'è nulla qui, aggiungere un gruppo oppure un monitoraggio.",
"No Services": "Nessun Servizio",
From d47d8517a801b9826b3d6ce61aef77cf2f22a38d Mon Sep 17 00:00:00 2001
From: Louis
Date: Sun, 5 Dec 2021 16:05:52 +0800
Subject: [PATCH 128/142] 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 129/142] =?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 | 490 +++++++++++++++-------------------------------
package.json | 4 +-
2 files changed, 165 insertions(+), 329 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.",
- "dependencies": {
- "@babel/runtime": "^7.12.5",
- "@breejs/later": "^4.0.2",
- "boolean": "^3.0.2",
- "bthreads": "^0.5.1",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz",
+ "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==",
+ "dependencies": {
+ "@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_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==",
- "engines": {
- "node": ">=6"
- }
- },
- "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==",
- "dependencies": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.0"
+ "node": ">=10.13.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/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
- "locate-path": "^3.0.0"
+ "color-convert": "^2.0.1"
},
"engines": {
- "node": ">=6"
- }
- },
- "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"
+ "node": ">=8"
},
- "engines": {
- "node": ">=6"
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "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==",
+ "node_modules/qrcode/node_modules/cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"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"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
}
},
- "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==",
+ "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": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "color-name": "~1.1.4"
},
"engines": {
- "node": ">=6"
+ "node": ">=7.0.0"
}
},
- "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==",
- "requires": {
- "@babel/runtime": "^7.12.5",
- "@breejs/later": "^4.0.2",
- "boolean": "^3.0.2",
- "bthreads": "^0.5.1",
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/bree/-/bree-7.1.0.tgz",
+ "integrity": "sha512-1bKJDODePYjIIUvt/ImO5PnitRQjZnTfMnsXq64LAWf2muXn9lCju0PnKoayIHdYzEMKepXr+YYY+Y+cmaVkHA==",
+ "requires": {
+ "@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=="
- },
- "cliui": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
- "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
- "requires": {
- "string-width": "^3.1.0",
- "strip-ansi": "^5.2.0",
- "wrap-ansi": "^5.1.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==",
- "requires": {
- "locate-path": "^3.0.0"
- }
- },
- "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==",
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
- "p-locate": "^3.0.0",
- "path-exists": "^3.0.0"
+ "color-convert": "^2.0.1"
}
},
- "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==",
+ "cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"requires": {
- "p-limit": "^2.0.0"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.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==",
+ "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": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
+ "color-name": "~1.1.4"
}
},
- "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 130/142] 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];
From 03aeab04219b6c4e2ef003aaddcb6301fc772f97 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 6 Dec 2021 17:31:25 +0800
Subject: [PATCH 131/142] close issues that don't follow the issue template
Copy from axios
---
.github/workflows/close-issue.yml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 .github/workflows/close-issue.yml
diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml
new file mode 100644
index 000000000..2127fe166
--- /dev/null
+++ b/.github/workflows/close-issue.yml
@@ -0,0 +1,17 @@
+name: 'Close Invalid Issues'
+
+on:
+ issues:
+ types: [opened]
+
+jobs:
+ auto_close_issues:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Automatically close issues that don't follow the issue template
+ uses: lucasbento/auto-close-issues@v1.0.2
+ with:
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ issue-close-message: 'Hello! :wave: \n\nThis issue is being automatically closed because it does not follow the issue template. Please read the issue template carefully and follow all of the instructions when opening a new issue. \n\nThanks'
From 88bc08e7b758377636fd286d5aec58170ebce226 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 6 Dec 2021 17:36:18 +0800
Subject: [PATCH 132/142] Update close-issue.yml
---
.github/workflows/close-issue.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml
index 2127fe166..f6eb0ebc0 100644
--- a/.github/workflows/close-issue.yml
+++ b/.github/workflows/close-issue.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v1
- name: Automatically close issues that don't follow the issue template
uses: lucasbento/auto-close-issues@v1.0.2
with:
From c8e364911fbbc4be873c405f4b8704bc403c1a35 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Mon, 6 Dec 2021 17:46:46 +0800
Subject: [PATCH 133/142] Delete close-issue.yml, no idea why not working
---
.github/workflows/close-issue.yml | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 .github/workflows/close-issue.yml
diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml
deleted file mode 100644
index f6eb0ebc0..000000000
--- a/.github/workflows/close-issue.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: 'Close Invalid Issues'
-
-on:
- issues:
- types: [opened]
-
-jobs:
- auto_close_issues:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v1
- - name: Automatically close issues that don't follow the issue template
- uses: lucasbento/auto-close-issues@v1.0.2
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- issue-close-message: 'Hello! :wave: \n\nThis issue is being automatically closed because it does not follow the issue template. Please read the issue template carefully and follow all of the instructions when opening a new issue. \n\nThanks'
From f80215445607af4f02f9143a362f1c53e091bbe2 Mon Sep 17 00:00:00 2001
From: Ioma Taani
Date: Mon, 6 Dec 2021 11:33:39 +0100
Subject: [PATCH 134/142] updated
---
src/languages/it-IT.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js
index f76a3581c..20ee93db0 100644
--- a/src/languages/it-IT.js
+++ b/src/languages/it-IT.js
@@ -351,4 +351,5 @@ export default {
serwersmsAPIPassword: "Password API",
serwersmsPhoneNumber: "Numero di Telefono",
serwersmsSenderName: "Nome del mittente SMS (registrato via portale cliente)",
+ "stackfield": "Stackfield",
};
From a041a7964aa22682661bfed08976122cc5c55a85 Mon Sep 17 00:00:00 2001
From: iooner
Date: Tue, 7 Dec 2021 14:23:13 +0100
Subject: [PATCH 135/142] Fix typos
---
src/languages/fr-FR.js | 48 +++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js
index 92083a387..4cf863efb 100644
--- a/src/languages/fr-FR.js
+++ b/src/languages/fr-FR.js
@@ -1,5 +1,5 @@
export default {
- languageName: "Français (France)",
+ languageName: "Français",
checkEverySecond: "Vérifier toutes les {0} secondes",
retryCheckEverySecond: "Réessayer toutes les {0} secondes.",
retriesDescription: "Nombre d'essais avant que le service soit déclaré hors-ligne.",
@@ -13,17 +13,17 @@ export default {
pauseDashboardHome: "En pause",
deleteMonitorMsg: "Êtes-vous sûr de vouloir supprimer cette sonde ?",
deleteNotificationMsg: "Êtes-vous sûr de vouloir supprimer ce type de notifications ? Une fois désactivée, les services qui l'utilisent ne pourront plus envoyer de notifications.",
- resoverserverDescription: "Le DNS de cloudflare est utilisé par défaut, mais vous pouvez le changer si vous le souhaitez.",
- rrtypeDescription: "Veuillez séléctionner un type d'enregistrement DNS",
+ resoverserverDescription: "Le DNS de Cloudflare est utilisé par défaut, mais vous pouvez le changer si vous le souhaitez.",
+ rrtypeDescription: "Veuillez sélectionner un type d'enregistrement DNS",
pauseMonitorMsg: "Êtes-vous sûr de vouloir mettre en pause cette sonde ?",
enableDefaultNotificationDescription: "Pour chaque nouvelle sonde, cette notification sera activée par défaut. Vous pouvez toujours désactiver la notification séparément pour chaque sonde.",
clearEventsMsg: "Êtes-vous sûr de vouloir supprimer tous les événements pour cette sonde ?",
- clearHeartbeatsMsg: "Êtes-vous sûr de vouloir supprimer tous les vérifications pour cette sonde ?",
- confirmClearStatisticsMsg: "Êtes-vous sûr de vouloir supprimer tous les statistiques ?",
+ clearHeartbeatsMsg: "Êtes-vous sûr de vouloir supprimer toutes les vérifications pour cette sonde ?",
+ confirmClearStatisticsMsg: "Êtes-vous sûr de vouloir supprimer toutes les statistiques ?",
importHandleDescription: "Choisissez 'Ignorer l'existant' si vous voulez ignorer chaque sonde ou notification portant le même nom. L'option 'Écraser' supprime toutes les sondes et notifications existantes.",
confirmImportMsg: "Êtes-vous sûr de vouloir importer la sauvegarde ? Veuillez vous assurer que vous avez sélectionné la bonne option d'importation.",
twoFAVerifyLabel: "Veuillez saisir votre jeton pour vérifier que le système 2FA fonctionne.",
- tokenValidSettingsMsg: "Le jeton est valide ; Vous pouvez maintenant sauvegarder les paramètres 2FA.",
+ tokenValidSettingsMsg: "Le jeton est valide. Vous pouvez maintenant sauvegarder les paramètres 2FA.",
confirmEnableTwoFAMsg: "Êtes-vous sûr de vouloir activer le 2FA ?",
confirmDisableTwoFAMsg: "Êtes-vous sûr de vouloir désactiver le 2FA ?",
Settings: "Paramètres",
@@ -68,9 +68,9 @@ export default {
URL: "URL",
Hostname: "Nom d'hôte / adresse IP",
Port: "Port",
- "Heartbeat Interval": "Intervale de vérification",
+ "Heartbeat Interval": "Intervalle de vérification",
Retries: "Essais",
- "Heartbeat Retry Interval": "Réessayer l'intervale de vérification",
+ "Heartbeat Retry Interval": "Réessayer l'intervalle de vérification",
Advanced: "Avancé",
"Upside Down Mode": "Mode inversé",
"Max. Redirects": "Nombre maximum de redirections",
@@ -107,8 +107,8 @@ export default {
Password: "Mot de passe",
"Remember me": "Se souvenir de moi",
Login: "Se connecter",
- "No Monitors, please": "Pas de sondes, veuillez ",
- "add one": "en ajouter une.",
+ "No Monitors, please": "Pas de sondes, veuillez",
+ "add one": "en ajouter une",
"Notification Type": "Type de notification",
Email: "Email",
Test: "Tester",
@@ -132,7 +132,7 @@ export default {
Heartbeats: "Vérfications",
"Auto Get": "Récuperer automatiquement",
backupDescription: "Vous pouvez sauvegarder toutes les sondes et toutes les notifications dans un fichier JSON.",
- backupDescription2: "PS: Les données relatives à l'historique et aux événements ne sont pas incluses.",
+ backupDescription2: "PS : Les données relatives à l'historique et aux événements ne sont pas incluses.",
backupDescription3: "Les données sensibles telles que les jetons de notification sont incluses dans le fichier d'exportation, veuillez les conserver soigneusement.",
alertNoFile: "Veuillez sélectionner un fichier à importer.",
alertWrongFileType: "Veuillez sélectionner un fichier JSON à importer.",
@@ -196,7 +196,7 @@ export default {
webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
smtp: "Email (SMTP)",
- secureOptionNone: "Aucun / STARTTLS (25, 587)",
+ secureOptionNone: "Aucun/STARTTLS (25, 587)",
secureOptionTLS: "TLS (465)",
"Ignore TLS Error": "Ignorer les erreurs TLS",
"From Email": "Depuis l'Email",
@@ -217,7 +217,7 @@ export default {
Recipients: "Destinataires",
needSignalAPI: "Vous avez besoin d'un client Signal avec l'API REST.",
wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
- signalImportant: "IMPORTANT: Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
+ signalImportant: "IMPORTANT : Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
gotify: "Gotify",
"Application Token": "Application Token",
"Server URL": "Server URL",
@@ -226,7 +226,7 @@ export default {
"Icon Emoji": "Icon Emoji",
"Channel Name": "Nom du salon",
"Uptime Kuma URL": "Uptime Kuma URL",
- aboutWebhooks: "Plus d'informations sur les Webhooks ici: {0}",
+ aboutWebhooks: "Plus d'informations sur les Webhooks ici : {0}",
aboutChannelName: "Mettez le nom du salon dans {0} dans 'Channel Name' si vous voulez bypass le salon Webhook. Ex : #autre-salon",
aboutKumaURL: "Si vous laissez l'URL d'Uptime Kuma vierge, elle redirigera vers la page du projet GitHub.",
emojiCheatSheet: "Emoji cheat sheet : {0}",
@@ -244,14 +244,14 @@ export default {
Device: "Appareil",
"Message Title": "Titre du message",
"Notification Sound": "Son de notification",
- "More info on:": "Plus d'informations sur: {0}",
+ "More info on:": "Plus d'informations sur : {0}",
pushoverDesc1: "Priorité d'urgence (2) a par défaut 30 secondes de délai dépassé entre les tentatives et expierera après 1 heure.",
pushoverDesc2: "Si vous voulez envoyer des notifications sur différents Appareils, remplissez le champ 'Device'.",
"SMS Type": "SMS Type",
octopushTypePremium: "Premium (Rapide - recommandé pour les alertes)",
- octopushTypeLowCost: "A bas prix (Lent, bloqué de temps en temps par l'opérateur)",
+ octopushTypeLowCost: "À bas prix (Lent, bloqué de temps en temps par l'opérateur)",
"Check octopush prices": "Vérifier les prix d'octopush {0}.",
- octopushPhoneNumber: "Numéro de téléphone (format intérn., ex : +33612345678) ",
+ octopushPhoneNumber: "Numéro de téléphone (format int., ex : +33612345678) ",
octopushSMSSender: "Nom de l'envoyer : 3-11 caractères alphanumériques avec espace (a-zA-Z0-9)",
"LunaSea Device ID": "LunaSea Device ID",
"Apprise URL": "Apprise URL",
@@ -259,8 +259,8 @@ export default {
"Read more:": "En savoir plus : {0}",
"Status:": "Status : {0}",
"Read more": "En savoir plus",
- appriseInstalled: "Apprise est intallé.",
- appriseNotInstalled: "Apprise n'est pas intallé. {0}",
+ appriseInstalled: "Apprise est installé.",
+ appriseNotInstalled: "Apprise n'est pas installé. {0}",
"Access Token": "Access Token",
"Channel access token": "Channel access token",
"Line Developers Console": "Line Developers Console",
@@ -278,30 +278,30 @@ export default {
promosmsTypeFull: "SMS FULL - Version Premium des SMS, Vous pouvez mettre le nom de l'expéditeur (Vous devez vous enregistrer avant). Fiable pour les alertes.",
promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
- promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+ promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base : InfoSMS, SMS Info, MaxSMS, INFO, SMS",
"Primary Base URL": "Primary Base URL",
emailCustomSubject: "Sujet personalisé",
clicksendsms: "ClickSend SMS",
- checkPrice: "Vérification {0} tarifs:",
+ checkPrice: "Vérification {0} tarifs :",
apiCredentials: "Crédentials de l'API",
octopushLegacyHint: "Vous utilisez l'ancienne version d'Octopush (2011-2020) ou la nouvelle version ?",
"Feishu WebHookUrl": "Feishu WebHookURL",
matrixHomeserverURL: "L'URL du serveur (avec http(s):// et le port de manière facultatif)",
"Internal Room Id": "ID de la salle interne",
- matrixDesc1: "Vous pouvez trouvez l'ID de salle interne en regardant dans la section avancée des paramètres dans le client Matrix. C'est sensé ressembler à: !QMdRCpUIfLwsfjxye6:home.server.",
+ matrixDesc1: "Vous pouvez trouver l'ID de salle interne en regardant dans la section avancée des paramètres dans le client Matrix. C'est censé ressembler à !QMdRCpUIfLwsfjxye6:home.server.",
matrixDesc2: "Il est fortement recommandé de créer un nouvel utilisateur et de ne pas utiliser le jeton d'accès de votre propre utilisateur Matrix, car il vous donnera un accès complet à votre compte et à toutes les salles que vous avez rejointes. Au lieu de cela, créez un nouvel utilisateur et invitez-le uniquement dans la salle dans laquelle vous souhaitez recevoir la notification. Vous pouvez obtenir le jeton d'accès en exécutant {0}",
Method: "Méthode",
Body: "Le corps",
Headers: "En-têtes",
PushUrl: "Push URL",
- HeadersInvalidFormat: "L'en-têtes de la requête n'est pas dans un format JSON valide: ",
+ HeadersInvalidFormat: "Les en-têtes de la requête ne sont pas dans un format JSON valide: ",
BodyInvalidFormat: "Le corps de la requête n'est pas dans un format JSON valide: ",
"Monitor History": "Historique de la sonde",
clearDataOlderThan: "Garder l'historique des données de la sonde durant {0} jours.",
PasswordsDoNotMatch: "Les mots de passe ne correspondent pas.",
records: "Enregistrements",
"One record": "Un enregistrement",
- steamApiKeyDescription: "Pour surveiller un serveur Steam, vous avez besoin d'une clé Steam Web-API. Vous pouvez enregistrer votre clé ici: ",
+ steamApiKeyDescription: "Pour surveiller un serveur Steam, vous avez besoin d'une clé Steam Web-API. Vous pouvez enregistrer votre clé ici : ",
"Current User": "Utilisateur actuel",
recent: "Récent",
};
From dcc91d6c7258707caf1df65eb07d3b21845dfc9e Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 8 Dec 2021 14:59:59 +0800
Subject: [PATCH 136/142] Fix #922
---
server/model/monitor.js | 12 ++++++++++++
server/routers/api-router.js | 12 ++++--------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/server/model/monitor.js b/server/model/monitor.js
index ab0c1d409..6aa614b74 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -296,6 +296,9 @@ class Monitor extends BeanModel {
debug("heartbeatCount" + heartbeatCount + " " + time);
if (heartbeatCount <= 0) {
+ // Fix #922, since previous heartbeat could be inserted by api, it should get from database
+ previousBeat = await Monitor.getPreviousHeartbeat(this.id);
+
throw new Error("No heartbeat in the time window");
} else {
// No need to insert successful heartbeat for push type, so end here
@@ -751,6 +754,15 @@ class Monitor extends BeanModel {
debug("No notification, no need to send cert notification");
}
}
+
+ static async getPreviousHeartbeat(monitorID) {
+ return await R.getRow(`
+ SELECT status, time FROM heartbeat
+ WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
+ `, [
+ monitorID
+ ]);
+ }
}
module.exports = Monitor;
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index 79e828378..70d94673f 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -31,12 +31,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
throw new Error("Monitor not found or not active.");
}
- const previousHeartbeat = await R.getRow(`
- SELECT status, time FROM heartbeat
- WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
- `, [
- monitor.id
- ]);
+ const previousHeartbeat = await Monitor.getPreviousHeartbeat(monitor.id);
let status = UP;
if (monitor.isUpsideDown()) {
@@ -157,8 +152,9 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
JOIN tag
ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id = ?`, [monitor.id]
- );
- return {...monitor, tags: tags}
+ );
+ return { ...monitor,
+ tags: tags };
}));
}
From d4bfe57b7994231cbb48096706dac5555c9af9c0 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 8 Dec 2021 15:04:18 +0800
Subject: [PATCH 137/142] minor: improve formatting
---
server/routers/api-router.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/routers/api-router.js b/server/routers/api-router.js
index 70d94673f..1920cef71 100644
--- a/server/routers/api-router.js
+++ b/server/routers/api-router.js
@@ -153,8 +153,10 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id = ?`, [monitor.id]
);
- return { ...monitor,
- tags: tags };
+ return {
+ ...monitor,
+ tags: tags
+ };
}));
}
From 7899707582e4a0a9b766f906932505254278b3be Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 8 Dec 2021 15:17:37 +0800
Subject: [PATCH 138/142] update to 1.11.0
---
package.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 69aca8bb2..38f018e9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "uptime-kuma",
- "version": "1.10.2",
+ "version": "1.11.0",
"license": "MIT",
"repository": {
"type": "git",
@@ -30,13 +30,13 @@
"build-docker": "npm run build-docker-debian && npm run build-docker-alpine",
"build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
"build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
- "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.10.2-alpine --target release . --push",
- "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.10.2 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.10.2-debian --target release . --push",
+ "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.11.0-alpine --target release . --push",
+ "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.11.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.11.0-debian --target release . --push",
"build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
"build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
"build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
"upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
- "setup": "git checkout 1.10.2 && npm ci --production && npm run download-dist",
+ "setup": "git checkout 1.11.0 && npm ci --production && npm run download-dist",
"download-dist": "node extra/download-dist.js",
"update-version": "node extra/update-version.js",
"mark-as-nightly": "node extra/mark-as-nightly.js",
From c91f517121c28707dac0bd1f898e5f10f9682abc Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 8 Dec 2021 15:25:43 +0800
Subject: [PATCH 139/142] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index ea2281667..d870d6175 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@ docker volume create uptime-kuma
docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
```
+⚠️ Please use a **local volume** only. Other types such as NFS are not supported.
+
Browse to http://localhost:3001 after starting.
### 💪🏻 Non-Docker
From f9cd0eb084bda06dd20d6a1d7533bf682a889fda Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Wed, 8 Dec 2021 15:35:44 +0800
Subject: [PATCH 140/142] fix upload-artifacts
---
docker/dockerfile | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/dockerfile b/docker/dockerfile
index efbbfe6f2..a9984351b 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -33,7 +33,7 @@ RUN apt update && \
COPY --from=build /app /app
-ARG VERSION=1.9.1
+ARG VERSION
ARG GITHUB_TOKEN
ARG TARGETARCH
ARG PLATFORM=debian
diff --git a/package.json b/package.json
index 38f018e9e..1a5424df8 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
"build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
"build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
- "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
+ "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
"setup": "git checkout 1.11.0 && npm ci --production && npm run download-dist",
"download-dist": "node extra/download-dist.js",
"update-version": "node extra/update-version.js",
From a4841eb8aa8744d8e9439a5b164848bb4b9bb831 Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Thu, 9 Dec 2021 01:19:09 +0800
Subject: [PATCH 141/142] Fix #1016, .at() is not support in Safari
---
src/pages/Settings.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue
index 3378a0e91..58162f571 100644
--- a/src/pages/Settings.vue
+++ b/src/pages/Settings.vue
@@ -49,8 +49,9 @@ export default {
computed: {
currentPage() {
- let pathEnd = useRoute().path.split("/").at(-1);
- if (pathEnd == "settings" || pathEnd == null) {
+ let pathSplit = useRoute().path.split("/");
+ let pathEnd = pathSplit[pathSplit.length - 1];
+ if (!pathEnd || pathEnd === "settings") {
return "general";
}
return pathEnd;
From 8bb8b0a53c7f840d2d1ddff4987434474d34d28d Mon Sep 17 00:00:00 2001
From: Louis Lam
Date: Thu, 9 Dec 2021 01:23:49 +0800
Subject: [PATCH 142/142] update to 1.11.1
---
package.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 1a5424df8..79ed1c30e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "uptime-kuma",
- "version": "1.11.0",
+ "version": "1.11.1",
"license": "MIT",
"repository": {
"type": "git",
@@ -30,13 +30,13 @@
"build-docker": "npm run build-docker-debian && npm run build-docker-alpine",
"build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
"build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
- "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.11.0-alpine --target release . --push",
- "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.11.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.11.0-debian --target release . --push",
+ "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.11.1-alpine --target release . --push",
+ "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.11.1 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.11.1-debian --target release . --push",
"build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
"build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
"build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
"upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
- "setup": "git checkout 1.11.0 && npm ci --production && npm run download-dist",
+ "setup": "git checkout 1.11.1 && npm ci --production && npm run download-dist",
"download-dist": "node extra/download-dist.js",
"update-version": "node extra/update-version.js",
"mark-as-nightly": "node extra/mark-as-nightly.js",