From f2a27a2cf1d74ef9a90a4a689200cb62d15f66ad Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Fri, 29 Oct 2021 13:37:38 +0200 Subject: [PATCH 01/31] Use `hideCount` option for pagination --- package.json | 16 ++++++++-------- src/pages/DashboardHome.vue | 4 +--- src/pages/Details.vue | 4 +--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index aa54f4bef..644533d5b 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "args-parser": "~1.3.0", "axios": "~0.21.4", "bcryptjs": "~2.4.3", - "bootstrap": "~5.1.1", + "bootstrap": "~5.1.3", "bree": "~6.3.1", "chardet": "^1.3.0", - "chart.js": "~3.5.1", + "chart.js": "~3.6.0", "chartjs-adapter-dayjs": "~1.0.0", "check-password-strength": "^2.0.3", "command-exists": "~1.2.9", @@ -93,9 +93,9 @@ "tcp-ping": "~0.1.1", "thirty-two": "~1.0.2", "timezones-list": "~3.0.1", - "v-pagination-3": "~0.1.6", + "v-pagination-3": "~0.1.7", "vue": "next", - "vue-chart-3": "~0.5.8", + "vue-chart-3": "~0.5.11", "vue-confirm-dialog": "~1.0.2", "vue-contenteditable": "~3.0.4", "vue-i18n": "~9.1.9", @@ -110,9 +110,9 @@ "@babel/eslint-parser": "~7.15.7", "@babel/preset-env": "^7.15.8", "@types/bootstrap": "~5.1.6", - "@vitejs/plugin-legacy": "~1.6.1", - "@vitejs/plugin-vue": "~1.9.2", - "@vue/compiler-sfc": "~3.2.19", + "@vitejs/plugin-legacy": "~1.6.2", + "@vitejs/plugin-vue": "~1.9.4", + "@vue/compiler-sfc": "~3.2.20", "babel-plugin-rewire": "~1.2.0", "core-js": "~3.18.1", "cross-env": "~7.0.3", @@ -126,6 +126,6 @@ "stylelint": "~13.13.1", "stylelint-config-standard": "~22.0.0", "typescript": "~4.4.3", - "vite": "~2.6.4" + "vite": "~2.6.13" } } diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue index 2832b1c7f..16d07983b 100644 --- a/src/pages/DashboardHome.vue +++ b/src/pages/DashboardHome.vue @@ -83,9 +83,7 @@ export default { perPage: 25, heartBeatList: [], paginationConfig: { - texts: { - count: "", - }, + hideCount: true, chunksNavigation: "scroll", }, }; diff --git a/src/pages/Details.vue b/src/pages/Details.vue index b8a75b29b..d40561fe0 100644 --- a/src/pages/Details.vue +++ b/src/pages/Details.vue @@ -209,9 +209,7 @@ export default { toggleCertInfoBox: false, showPingChartBox: true, paginationConfig: { - texts: { - count: "", - }, + hideCount: true, chunksNavigation: "scroll", }, }; From eaecd6e571d9faf77e13e09e65c2202344288760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Bratovi=C4=87?= Date: Fri, 29 Oct 2021 16:53:55 +0200 Subject: [PATCH 02/31] Clarity and grammar fixes to hr_HR languange file --- src/languages/hr-HR.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/languages/hr-HR.js b/src/languages/hr-HR.js index 78143a149..35383a0f3 100644 --- a/src/languages/hr-HR.js +++ b/src/languages/hr-HR.js @@ -5,7 +5,7 @@ export default { retriesDescription: "Broj ponovnih pokušaja prije nego će se servis označiti kao DOWN 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.", - maxRedirectDescription: "Maksimalan broj preusmjeravanja. Postaviti na 0 kako bi se preusmeravanja onemogućila.", + 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.", @@ -20,7 +20,7 @@ export default { clearEventsMsg: "Jeste li sigurni da želite izbrisati sve zapise o događajima za ovaj monitor?", clearHeartbeatsMsg: "Jeste li sigurni da želite izbrisati sve zapise o provjerama za ovaj monitor?", confirmClearStatisticsMsg: "Jeste li sigurni da želite izbrisati SVE statistike?", - importHandleDescription: "Odaberite opciju 'Preskoči postojeće' ako želite prekočiti uvoz već postojećih monitora i obavijesti. Opcija 'Prepiši' će izbrisati postojeće monitore i obavijesti.", + importHandleDescription: "Odaberite opciju \"Preskoči postojeće\" ako želite preskočiti uvoz postojećih monitora i obavijesti ako dođe do poklapanja u imenu. Opcija \"Prepiši\" će izbrisati postojeće monitore i obavijesti.", confirmImportMsg: "Jeste li sigurni da želite pokrenuti uvoz? Provjerite jeste li odabrali ispravnu opciju uvoza.", twoFAVerifyLabel: "Unesite svoj 2FA token:", tokenValidSettingsMsg: "Token je važeći! Sada možete spremiti postavke dvofaktorske autentikacije.", @@ -44,7 +44,7 @@ export default { Down: "Nedostupno", Pending: "U tijeku", Unknown: "Nepoznato", - Pause: "Pauziraj", + Pause: "Pauzirano", Name: "Naziv monitora", Status: "Status", DateTime: "Vremenska oznaka", @@ -77,7 +77,7 @@ export default { "Max. Redirects": "Maksimalan broj preusmjeravanja", "Accepted Status Codes": "Prihvaćeni statusni kodovi", "Push URL": "Push URL", - needPushEvery: "Potrebno je zvati ovaj URL svakih {0} sekundi.", + needPushEvery: "Potrebno je slati zahtjeve na URL svakih {0} sekundi.", pushOptionalParams: "Neobavezni parametri: {0}", Save: "Spremi", Notifications: "Obavijesti", @@ -135,9 +135,9 @@ export default { Events: "Events", Heartbeats: "Provjere", "Auto Get": "Automatski dohvat", - backupDescription: "Moguće je napraviti sigurnosnu kopiju svih monitora i obavijesti u JSON datoteku.", + 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 izvozu; potrebno je čuvati izvoz na sigurnom mjestu.", + backupDescription3: "Osjetljivi podaci poput tokena za obavijesti jesu uključeni 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", @@ -197,14 +197,14 @@ export default { webhook: "Webhook", "Post URL": "Post URL", "Content Type": "Tip sadržaja (Content Type)", - webhookJsonDesc: "{0} je moguća opcija za moderne HTTP poslužitelje poput Express.js-a", + 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)", secureOptionNone: "Bez sigurnosti / STARTTLS (25, 587)", secureOptionTLS: "TLS (465)", "Ignore TLS Error": "Ignoriraj greške TLS-a", - "From Email": "Adresa za From polje", - emailCustomSubject: "Prilagođeno Subject polje", + "From Email": "Adresa za \"From\" polje", + emailCustomSubject: "Prilagođeno \"Subject\" polje", "To Email": "Odredišne adrese e-pošte", smtpCC: "Cc", smtpBCC: "Bcc", @@ -233,7 +233,7 @@ export default { "Uptime Kuma URL": "Uptime Kuma URL", aboutWebhooks: "Dodatne informacije o webhookovima su dostupne na: {0}", aboutChannelName: "Unesite ime {0} kanala u polju Naziv kanala ako želite zaobići webhook kanal. Primjerice: #neki-kanal", - aboutKumaURL: "Ako je polje Uptime Kuma URL prazno, koristi se zadana vrijednost koja vodi na GitHub stranicu projekta.", + aboutKumaURL: "Ako je polje \"Uptime Kuma URL\" prazno, koristi se zadana vrijednost koja vodi na GitHub stranicu projekta.", emojiCheatSheet: "Popis emotikona: {0}", "rocket.chat": "Rocket.Chat", pushover: "Pushover", @@ -252,7 +252,7 @@ export default { "Notification Sound": "Zvuk obavijesti", "More info on:": "Više informacija na: {0}", pushoverDesc1: "Hitni prioritet (2) ima zadani istek vremena od 30 sekundi između ponovnih pokušaja te će isteći nakon 1 sata.", - pushoverDesc2: "Ako želite slati obavijesti na više uređaja, ispunite polje Uređaji.", + pushoverDesc2: "Ako želite slati obavijesti na više uređaja, ispunite polje \"Uređaji\".", "SMS Type": "Tip SMS-a", octopushTypePremium: "Premium (Brzo - preporučeno za obavijesti)", octopushTypeLowCost: "Low Cost (Sporo - mobilni operateri ponekad blokiraju ove poruke)", @@ -277,7 +277,7 @@ export default { "Basic Settings": "Osnovne Postavke", "User ID": "Korisnički ID", "Messaging API": "API za razmjenu poruka", - wayToGetLineChannelToken: "Prvo, pristupite {0}, kreirajte create a pružatelja usluga te kanal (API za razmjenu poruka), zatim možete dobiti you can get the token za pristup kanalu te korisnički ID za polja iznad.", + wayToGetLineChannelToken: "Prvo, pristupite {0}, kreirajte pružatelja usluga te kanal (API za razmjenu poruka), zatim možete dobiti token za pristup kanalu te korisnički ID za polja iznad.", "Icon URL": "URL slike", aboutIconURL: "Možete postaviti poveznicu na sliku u polju \"URL slike\" kako biste spriječili korištenje zadane slike. Ovo se polje neće koristiti ako je postavljeno polje \"Emotikon\".", aboutMattermostChannelName: "Možete promijeniti kanal u kojeg webhook šalje tako da ispunite polje \"Naziv kanala\". Ta opcija mora biti omogućena unutar Mattermost postavki za webhook. Primjerice: #neki-kanal", @@ -286,19 +286,19 @@ export default { promosmsTypeFlash: "SMS FLASH - Poruka se automatski pojavljuje na uređaju primatelja. Ograničeno samo na primatelje unutar Poljske.", promosmsTypeFull: "SMS FULL - Premium razina usluge, dozvoljava postavljanje naziva SMS pošiljatelja (Naziv mora biti registriran). Usluga pouzdana za obavijesti.", promosmsTypeSpeed: "SMS SPEED - Usluga najvećeg prioriteta. Brza i pouzdana, ali skupa (otprilike dvostruko skuplja od cijene usluge SMS FULL).", - promosmsPhoneNumber: "Telefonski broj (za primitalje unutar Poljske nije potrebno navoditi pozivni broj države)", + promosmsPhoneNumber: "Telefonski broj (za primatelje unutar Poljske nije potrebno navoditi pozivni broj države)", promosmsSMSSender: "Naziv SMS pošiljatelja: Registriran naziv ili jedan od zadanih: InfoSMS, SMS Info, MaxSMS, INFO, SMS", "Feishu WebHookUrl": "Feishu URL webhooka", - matrixHomeserverURL: "URL homeservera (uključujući http(s):// te port, ako je potrebno)", + matrixHomeserverURL: "URL Matrix homeservera (uključujući http(s):// te port, ako je potrebno)", "Internal Room Id": "Interni ID sobe", matrixDesc1: "Interni ID sobe se može pronaći u naprednim postavkama sobe unutar Matrix klijenta. ID sobe nalikuje idućem zapisu: !QMdRCpUIfLwsfjxye6:home.server.", - matrixDesc2: "Preporuča se stvaranje novog korisnika te suzdržavanje od korištenja pristupnog tokena vlastitog Matrix korisnika. Novog korisnika potrebno je dodati u sobe u kojima želite primati obavijesti. Pristupni token možete dobiti pokretanjem naredbe {0}", + matrixDesc2: "Preporučuje se stvaranje novog korisnika te suzdržavanje od korištenja pristupnog tokena vlastitog Matrix korisnika. Novog korisnika potrebno je dodati u sobe u kojima želite primati obavijesti. Pristupni token možete dobiti pokretanjem naredbe {0}", Method: "Metoda", Body: "Tijelo", Headers: "Zaglavlja", PushUrl: "Push URL", HeadersInvalidFormat: "Zaglavlja nisu nije valjani JSON: ", - BodyInvalidFormat: "Tijelo zahjeva nije valjani JSON: ", + BodyInvalidFormat: "Tijelo zahtjeva nije valjani JSON: ", "Monitor History": "Povijest monitora", clearDataOlderThan: "Podaci o povijesti monitora čuvaju se {0} dana.", PasswordsDoNotMatch: "Lozinke se ne poklapaju.", From 69aa60d1fbd0dfa35163fe7ae842f40a1b063f33 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Fri, 29 Oct 2021 17:01:29 +0200 Subject: [PATCH 03/31] Add missing i18n key + translate 2 keys for polish --- src/languages/en.js | 1 + src/languages/pl.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/languages/en.js b/src/languages/en.js index db376720c..15c3cd0f3 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -306,4 +306,5 @@ export default { "One record": "One record", 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", }; diff --git a/src/languages/pl.js b/src/languages/pl.js index 89faa6348..747ca1ad1 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -303,4 +303,6 @@ export default { records: "rekordy", "One record": "Jeden rekord", steamApiKeyDescription: "Do monitorowania serwera gier Steam potrzebny jest klucz Steam Web-API. Możesz zarejestrować swój klucz API tutaj: ", + "Current User": "Aktualny użytkownik", + recent: "Ostatnie", }; From caa2a341772e823688880d3cf3e78c44c8acb365 Mon Sep 17 00:00:00 2001 From: Louis Date: Sat, 30 Oct 2021 02:35:05 +0800 Subject: [PATCH 04/31] fix 2fa not working #833 --- server/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index c4d18869e..61484e03e 100644 --- a/server/server.js +++ b/server/server.js @@ -263,9 +263,8 @@ exports.entryPage = "dashboard"; let user = await login(data.username, data.password); if (user) { - afterLogin(socket, user); - if (user.twofaStatus == 0) { + afterLogin(socket, user); callback({ ok: true, token: jwt.sign({ @@ -284,6 +283,7 @@ exports.entryPage = "dashboard"; let verify = notp.totp.verify(data.token, user.twofa_secret, twofa_verification_opts); if (verify && verify.delta == 0) { + afterLogin(socket, user); callback({ ok: true, token: jwt.sign({ From cf548df15fcbebf2692f8d6648a8fb1b5a04d513 Mon Sep 17 00:00:00 2001 From: Louis Date: Sat, 30 Oct 2021 02:36:40 +0800 Subject: [PATCH 05/31] update to 1.9.2 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 174ab6aa6..d4acdc4cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.9.1", + "version": "1.9.2", "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.9.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.9.1 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.1-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.9.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.9.2 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.2-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.9.1 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.9.2 && 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 1dbf1c3dea4991fe91e63ce590be50b6b8d8e495 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 30 Oct 2021 23:33:20 +0800 Subject: [PATCH 06/31] fix logout --- src/mixins/socket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 679794496..170a07a73 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -265,10 +265,10 @@ export default { }, logout() { + socket.emit("logout", () => { }); this.storage().removeItem("token"); this.socket.token = null; this.loggedIn = false; - this.clearData(); }, From e7104737e7c877a1fda546cf271ce9a30baf2876 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 00:36:46 +0800 Subject: [PATCH 07/31] prevent to show "New Update" when the Docker image is not ready yet --- server/check-version.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/check-version.js b/server/check-version.js index 2ab5fe514..a3465ddf0 100644 --- a/server/check-version.js +++ b/server/check-version.js @@ -9,18 +9,17 @@ let interval; exports.startInterval = () => { let check = async () => { try { - const res = await axios.get("https://raw.githubusercontent.com/louislam/uptime-kuma/master/package.json"); - - if (typeof res.data === "string") { - res.data = JSON.parse(res.data); - } + const res = await axios.get("https://uptime.kuma.pet/version"); // For debug if (process.env.TEST_CHECK_VERSION === "1") { - res.data.version = "1000.0.0"; + res.data.slow = "1000.0.0"; + } + + if (res.data.slow) { + exports.latestVersion = res.data.slow; } - exports.latestVersion = res.data.version; } catch (_) { } }; From 68b74f07e4d222572bda80f900e0fb0600390c69 Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Sat, 30 Oct 2021 19:06:32 -0400 Subject: [PATCH 08/31] Update wording of form field --- .github/ISSUE_TEMPLATE/ask-for-help.yaml | 4 ++-- .github/ISSUE_TEMPLATE/bug_report.yaml | 4 ++-- .github/ISSUE_TEMPLATE/feature_request.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/ask-for-help.yaml b/.github/ISSUE_TEMPLATE/ask-for-help.yaml index dd1bcaf76..a1425c9c9 100644 --- a/.github/ISSUE_TEMPLATE/ask-for-help.yaml +++ b/.github/ISSUE_TEMPLATE/ask-for-help.yaml @@ -62,8 +62,8 @@ body: - type: checkboxes id: no-duplicate-issues attributes: - label: "👀 Have you spent some time to check if this question has been raised before?" - description: "Please search in the issues without filters [here](https://github.com/louislam/uptime-kuma/issues?q=)" + 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 diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 5e3b5bf8a..81ea9a32d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -86,8 +86,8 @@ body: - type: checkboxes id: no-duplicate-issues attributes: - label: "👀 Have you spent some time to check if this issue has been raised before?" - description: "Please search in the issues without filters [here](https://github.com/louislam/uptime-kuma/issues?q=)" + 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 diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index bca32552f..1a3cebc09 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -52,8 +52,8 @@ body: - type: checkboxes id: no-duplicate-issues attributes: - label: "👀 Have you spent some time to check if this feature request has been raised before?" - description: "Please search in the issues without filters [here](https://github.com/louislam/uptime-kuma/issues?q=)" + 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 586c748d44aacdaad3273240a52d33ee3427dc08 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 13:07:10 +0800 Subject: [PATCH 09/31] vite build on host machine, since it is very slow on armv7/arm64 build --- .dockerignore | 1 - CONTRIBUTING.md | 5 +++-- docker/dockerfile | 6 +++--- docker/dockerfile-alpine | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6e11b36b9..4a63437a4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ /.idea -/dist /node_modules /data /out diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9f186df2..b2efe3e09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -226,10 +226,11 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc 1. Draft a release note 1. Make sure the repo is cleared 1. `npm run update-version 1.X.X` +1. `npm run build` 1. `npm run build-docker` -1. git push +1. `git push` 1. Publish the release note as 1.X.X -1. npm run upload-artifacts +1. `npm run upload-artifacts` 1. SSH to demo site server and update to 1.X.X Checking: diff --git a/docker/dockerfile b/docker/dockerfile index e2a3725fa..efbbfe6f2 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -4,9 +4,7 @@ WORKDIR /app ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 COPY . . -RUN npm ci && \ - npm run build && \ - npm ci --production && \ +RUN npm ci --production && \ chmod +x /app/extra/entrypoint.sh @@ -22,9 +20,11 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD nod ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"] CMD ["node", "server/server.js"] + FROM release AS nightly RUN npm run mark-as-nightly + # Upload the artifact to Github FROM louislam/uptime-kuma:base-debian AS upload-artifact WORKDIR / diff --git a/docker/dockerfile-alpine b/docker/dockerfile-alpine index e883031ae..ab9255f95 100644 --- a/docker/dockerfile-alpine +++ b/docker/dockerfile-alpine @@ -4,9 +4,7 @@ WORKDIR /app ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 COPY . . -RUN npm ci && \ - npm run build && \ - npm ci --production && \ +RUN npm ci --production && \ chmod +x /app/extra/entrypoint.sh @@ -22,5 +20,6 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD nod ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"] CMD ["node", "server/server.js"] + FROM release AS nightly RUN npm run mark-as-nightly From 08a58dec2b257e927ec742e9991b5bb687628332 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 13:17:34 +0800 Subject: [PATCH 10/31] fix manifest.json path --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index cd5da9360..6a5525fb4 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - + Uptime Kuma From 61135e850025711f80de85dc2b60d2bc38089655 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 13:18:06 +0800 Subject: [PATCH 11/31] update package-lock.json --- package-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index f65abc32a..11feb3492 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "uptime-kuma", - "version": "1.9.1", + "version": "1.9.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "uptime-kuma", - "version": "1.9.1", + "version": "1.9.2", "license": "MIT", "dependencies": { "@fortawesome/fontawesome-svg-core": "~1.2.36", @@ -18,10 +18,10 @@ "args-parser": "~1.3.0", "axios": "~0.21.4", "bcryptjs": "~2.4.3", - "bootstrap": "~5.1.1", + "bootstrap": "~5.1.3", "bree": "~6.3.1", "chardet": "^1.3.0", - "chart.js": "~3.5.1", + "chart.js": "~3.6.0", "chartjs-adapter-dayjs": "~1.0.0", "check-password-strength": "^2.0.3", "command-exists": "~1.2.9", @@ -50,9 +50,9 @@ "tcp-ping": "~0.1.1", "thirty-two": "~1.0.2", "timezones-list": "~3.0.1", - "v-pagination-3": "~0.1.6", + "v-pagination-3": "~0.1.7", "vue": "next", - "vue-chart-3": "~0.5.8", + "vue-chart-3": "~0.5.11", "vue-confirm-dialog": "~1.0.2", "vue-contenteditable": "~3.0.4", "vue-i18n": "~9.1.9", @@ -67,9 +67,9 @@ "@babel/eslint-parser": "~7.15.7", "@babel/preset-env": "^7.15.8", "@types/bootstrap": "~5.1.6", - "@vitejs/plugin-legacy": "~1.6.1", - "@vitejs/plugin-vue": "~1.9.2", - "@vue/compiler-sfc": "~3.2.19", + "@vitejs/plugin-legacy": "~1.6.2", + "@vitejs/plugin-vue": "~1.9.4", + "@vue/compiler-sfc": "~3.2.20", "babel-plugin-rewire": "~1.2.0", "core-js": "~3.18.1", "cross-env": "~7.0.3", @@ -83,7 +83,7 @@ "stylelint": "~13.13.1", "stylelint-config-standard": "~22.0.0", "typescript": "~4.4.3", - "vite": "~2.6.4" + "vite": "~2.6.13" }, "engines": { "node": "14.*" @@ -4259,9 +4259,9 @@ "integrity": "sha512-NpwMDdSIprbYx1CLnfbxEIarI0Z+s9MssEgggMNheGM+WD68yOhV7IEA/3r6tr0yTRgQD0HuZJDw32s99i6L+A==" }, "node_modules/chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz", + "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ==" }, "node_modules/chartjs-adapter-dayjs": { "version": "1.0.0", @@ -18000,9 +18000,9 @@ "integrity": "sha512-NpwMDdSIprbYx1CLnfbxEIarI0Z+s9MssEgggMNheGM+WD68yOhV7IEA/3r6tr0yTRgQD0HuZJDw32s99i6L+A==" }, "chart.js": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz", - "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz", + "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ==" }, "chartjs-adapter-dayjs": { "version": "1.0.0", From 124c98ce766a0d0ccc45f239fd94e3d61222cf60 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 13:48:05 +0800 Subject: [PATCH 12/31] update to 1.10.0 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9aa8be06a..64be83ee1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.9.2", + "version": "1.10.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.9.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.9.2 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.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.10.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.10.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.10.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.9.2 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.10.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 8840ca618bf120fa49811e1b603a67a4f7ab01a6 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 31 Oct 2021 21:22:19 +0100 Subject: [PATCH 13/31] Update `pl.js` --- src/languages/pl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/languages/pl.js b/src/languages/pl.js index 747ca1ad1..430224469 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -28,7 +28,7 @@ export default { confirmDisableTwoFAMsg: "Jesteś pewien, że chcesz wyłączyć 2FA?", Settings: "Ustawienia", Dashboard: "Panel", - "New Update": "Nowa Aktualizacja", + "New Update": "Nowa aktualizacja", Language: "Język", Appearance: "Wygląd", Theme: "Motyw", @@ -305,4 +305,6 @@ export default { steamApiKeyDescription: "Do monitorowania serwera gier Steam potrzebny jest klucz Steam Web-API. Możesz zarejestrować swój klucz API tutaj: ", "Current User": "Aktualny użytkownik", recent: "Ostatnie", + clicksendsms: "ClickSend SMS", + apiCredentials: "Poświadczenia API", }; From bb96a577ca66c9de771195ae27bb1300d9e7ae33 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 31 Oct 2021 21:47:07 +0100 Subject: [PATCH 14/31] Fix typos + translate `wayToGetTeamsURL` --- src/languages/pl.js | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/languages/pl.js b/src/languages/pl.js index 430224469..95d5890f3 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -37,7 +37,7 @@ export default { "Check Update On GitHub": "Sprawdź aktualizację na GitHub", List: "Lista", Add: "Dodaj", - "Add New Monitor": "Dodaj Monitor", + "Add New Monitor": "Dodaj monitor", "Quick Stats": "Szybki podgląd statystyk", Up: "Online", Down: "Offline", @@ -53,8 +53,8 @@ export default { Edit: "Edytuj", Delete: "Usuń", Current: "Aktualny", - Uptime: "Czas Pracy", - "Cert Exp.": "Certyfikat Wygasa", + Uptime: "Czas pracy", + "Cert Exp.": "Certyfikat wygasa", days: "dni", day: "dzień", "-day": " dni", @@ -62,9 +62,9 @@ export default { "-hour": " godzin", Response: "Odpowiedź", Ping: "Ping", - "Monitor Type": "Rodzaj Monitora", + "Monitor Type": "Rodzaj monitora", Keyword: "Słowo kluczowe", - "Friendly Name": "Przyjazna Nazwa", + "Friendly Name": "Przyjazna nazwa", URL: "URL", Hostname: "Hostname", Port: "Port", @@ -73,12 +73,12 @@ export default { "Heartbeat Retry Interval": "Częstotliwość ponawiania bicia serca", Advanced: "Zaawansowane", "Upside Down Mode": "Tryb odwrócony", - "Max. Redirects": "Maks. Przekierowań", + "Max. Redirects": "Maks. przekierowań", "Accepted Status Codes": "Akceptowane kody statusu", Save: "Zapisz", Notifications: "Powiadomienia", "Not available, please setup.": "Niedostępne, proszę skonfigurować.", - "Setup Notification": "Skonfiguruj Powiadomienie", + "Setup Notification": "Skonfiguruj powiadomienie", Light: "Jasny", Dark: "Ciemny", Auto: "Automatyczny", @@ -122,7 +122,7 @@ export default { "Export Backup": "Eksportuj kopię zapasową", Export: "Eksportuj", Import: "Importuj", - respTime: "Czas Odp. (ms)", + respTime: "Czas odp. (ms)", notAvailableShort: "N/A", "Default enabled": "Włącz domyślnie", "Apply on all existing monitors": "Zastosuj do istniejących monitorów", @@ -183,7 +183,7 @@ export default { here: "tutaj", Required: "Wymagane", telegram: "Telegram", - "Bot Token": "Token Bota", + "Bot Token": "Token bota", wayToGetTelegramToken: "Token można uzyskać z {0}.", "Chat ID": "Identyfikator Czatu", supportTelegramChatID: "Czat wsprarcia technicznego / Bezpośrednia Rozmowa / Czat Grupowy", @@ -198,20 +198,20 @@ export default { smtp: "Email (SMTP)", secureOptionNone: "Brak / STARTTLS (25, 587)", secureOptionTLS: "TLS (465)", - "Ignore TLS Error": "Zignrouj Błędy TLS", + "Ignore TLS Error": "Zignoruj błędy TLS", "From Email": "Nadawca (OD)", "To Email": "Odbiorca (DO)", smtpCC: "DW", smtpBCC: "UDW", discord: "Discord", - "Discord Webhook URL": "URL Webhook Discorda", + "Discord Webhook URL": "URL webhook Discorda", wayToGetDiscordURL: "Możesz go uzyskać przechodząc do Ustawienia Serwera -> Integracje -> Tworzenie Webhooka", - "Bot Display Name": "Wyświetlana Nazwa Bota", - "Prefix Custom Message": "Własny Początek Wiadomości", + "Bot Display Name": "Wyświetlana nazwa bota", + "Prefix Custom Message": "Własny początek wiadomości", "Hello @everyone is...": "Hej {'@'}everyone ...", teams: "Microsoft Teams", - "Webhook URL": "URL Webhooka", - wayToGetTeamsURL: "You can learn how to create a webhook url {0}.", + "Webhook URL": "URL webhooka", + wayToGetTeamsURL: "Możesz dowiedzieć się, jak utworzyć adres url webhooka {0}.", signal: "Signal", Number: "Numer", Recipients: "Odbiorcy", @@ -219,17 +219,17 @@ export default { wayToCheckSignalURL: "W celu dowiedzenia się, jak go skonfigurować, odwiedź poniższy link:", signalImportant: "UWAGA: Nie można mieszać nazw grup i numerów odbiorców!", gotify: "Gotify", - "Application Token": "Token Aplikacji", + "Application Token": "Token aplikacji", "Server URL": "Server URL", Priority: "Priorytet", slack: "Slack", - "Icon Emoji": "Ikona Emoji", - "Channel Name": "Nazwa Kanału", + "Icon Emoji": "Ikona emoji", + "Channel Name": "Nazwa kanału", "Uptime Kuma URL": "Adres Uptime Kuma", aboutWebhooks: "Więcej informacji na temat webhooków: {0}", aboutChannelName: "Podaj nazwę kanału {0} w polu Nazwa Kanału, jeśli chcesz pominąć kanał webhooka. Np.: #inny-kanal", aboutKumaURL: "Jeśli pozostawisz pole Adres Uptime Kuma puste, domyślnie będzie to strona projektu na Github.", - emojiCheatSheet: "Ściąga Emoji: {0}", + emojiCheatSheet: "Ściąga emoji: {0}", "rocket.chat": "Rocket.chat", pushover: "Pushover", pushy: "Pushy", @@ -240,10 +240,10 @@ export default { pushbullet: "Pushbullet", line: "Line Messenger", mattermost: "Mattermost", - "User Key": "Klucz Użytkownika", + "User Key": "Klucz użytkownika", Device: "Urządzenie", - "Message Title": "Tytuł Wiadomości", - "Notification Sound": "Dźwięk Powiadomienia", + "Message Title": "Tytuł wiadomości", + "Notification Sound": "Dźwięk powiadomienia", "More info on:": "Więcej informacji na: {0}", pushoverDesc1: "Priorytet awaryjny (2) ma domyślny 30-sekundowy limit czasu między kolejnymi próbami i wygaśnie po 1 godzinie.", pushoverDesc2: "Jeśli chcesz wysyłać powiadomienia na różne urządzenia, wypełnij pole Urządzenie.", @@ -253,21 +253,21 @@ export default { "Check octopush prices": "Sprawdź ceny Octopush {0}.", octopushPhoneNumber: "Numer Telefonu (Format międzynarodowy np.: +33612345678)", octopushSMSSender: "Nadawca SMS : 3-11 znaków alfanumerycznych i spacji (a-zA-Z0-9)", - "LunaSea Device ID": "Idetyfikator Urządzenia LunaSea", + "LunaSea Device ID": "Idetyfikator urządzenia LunaSea", "Apprise URL": "URL Apprise", "Example:": "Przykład: {0}", - "Read more:": "Czytaj Dalej: {0}", + "Read more:": "Czytaj dalej: {0}", "Status:": "Status: {0}", "Read more": "Czytaj dalej", appriseInstalled: "Apprise jest zostało zainstalowane.", appriseNotInstalled: "Apprise nie zostało zainstalowane. {0}", - "Access Token": "Token Dostępu", - "Channel access token": "Token Dostępu Kanału", - "Line Developers Console": "Konsola Dewelopersja Line", - lineDevConsoleTo: "Konsola Dewelopersja Line - {0}", - "Basic Settings": "Ustawienia Ogólne", - "User ID": "Idetyfikator Użytkownika", - "Messaging API": "API Wiadomości", + "Access Token": "Token dostępu", + "Channel access token": "Token dostępu kanału", + "Line Developers Console": "Konsola deweloperska Line", + lineDevConsoleTo: "Konsola deweloperska Line - {0}", + "Basic Settings": "Ustawienia ogólne", + "User ID": "Identyfikator użytkownika", + "Messaging API": "API wiadomości", wayToGetLineChannelToken: "Najpierw uzyskaj dostęp do {0}, utwórz dostawcę i kanał (Messaging API), a następnie możesz uzyskać token dostępu do kanału i identyfikator użytkownika z wyżej wymienionych pozycji menu.", "Icon URL": "Adres Ikony", aboutIconURL: "Możesz podać link do zdjęcia w \"Adres URL ikony\", aby zastąpić domyślne zdjęcie profilowe. Nie będzie używany, jeśli ustawiona jest ikona Emoji.", From b12b848d974683a257b0fdcaa4c272c2e1135412 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 31 Oct 2021 21:48:43 +0100 Subject: [PATCH 15/31] One more typo... --- src/languages/pl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/pl.js b/src/languages/pl.js index 95d5890f3..f672fdbf0 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -253,7 +253,7 @@ export default { "Check octopush prices": "Sprawdź ceny Octopush {0}.", octopushPhoneNumber: "Numer Telefonu (Format międzynarodowy np.: +33612345678)", octopushSMSSender: "Nadawca SMS : 3-11 znaków alfanumerycznych i spacji (a-zA-Z0-9)", - "LunaSea Device ID": "Idetyfikator urządzenia LunaSea", + "LunaSea Device ID": "Identyfikator urządzenia LunaSea", "Apprise URL": "URL Apprise", "Example:": "Przykład: {0}", "Read more:": "Czytaj dalej: {0}", From d06e5ef6fa805fbfc839803176b0cdd02423d4ad Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 31 Oct 2021 21:53:11 +0100 Subject: [PATCH 16/31] More small letters --- src/languages/pl.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/languages/pl.js b/src/languages/pl.js index f672fdbf0..1144d4ebe 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -236,7 +236,7 @@ export default { octopush: "Octopush", promosms: "PromoSMS", lunasea: "LunaSea", - apprise: "Apprise (Obsługuje 50+ usług powiadomień)", + apprise: "Apprise (obsługuje 50+ usług powiadomień)", pushbullet: "Pushbullet", line: "Line Messenger", mattermost: "Mattermost", @@ -248,11 +248,11 @@ export default { pushoverDesc1: "Priorytet awaryjny (2) ma domyślny 30-sekundowy limit czasu między kolejnymi próbami i wygaśnie po 1 godzinie.", pushoverDesc2: "Jeśli chcesz wysyłać powiadomienia na różne urządzenia, wypełnij pole Urządzenie.", "SMS Type": "Rodzaj SMS", - octopushTypePremium: "Premium (Szybki - rekomendowany dla powiadomień)", - octopushTypeLowCost: "Low Cost (Wolny, czasami blokowany przez operatorów)", + octopushTypePremium: "Premium (szybki - rekomendowany dla powiadomień)", + octopushTypeLowCost: "Low Cost (wolny, czasami blokowany przez operatorów)", "Check octopush prices": "Sprawdź ceny Octopush {0}.", - octopushPhoneNumber: "Numer Telefonu (Format międzynarodowy np.: +33612345678)", - octopushSMSSender: "Nadawca SMS : 3-11 znaków alfanumerycznych i spacji (a-zA-Z0-9)", + octopushPhoneNumber: "Numer telefonu (format międzynarodowy np.: +33612345678)", + octopushSMSSender: "Nadawca SMS: 3-11 znaków alfanumerycznych i spacji (a-zA-Z0-9)", "LunaSea Device ID": "Identyfikator urządzenia LunaSea", "Apprise URL": "URL Apprise", "Example:": "Przykład: {0}", @@ -271,14 +271,14 @@ export default { wayToGetLineChannelToken: "Najpierw uzyskaj dostęp do {0}, utwórz dostawcę i kanał (Messaging API), a następnie możesz uzyskać token dostępu do kanału i identyfikator użytkownika z wyżej wymienionych pozycji menu.", "Icon URL": "Adres Ikony", aboutIconURL: "Możesz podać link do zdjęcia w \"Adres URL ikony\", aby zastąpić domyślne zdjęcie profilowe. Nie będzie używany, jeśli ustawiona jest ikona Emoji.", - aboutMattermostChannelName: "Możesz zastąpić domyślny kanał, na którym publikowane są posty webhooka, wpisując nazwę kanału w polu \"Nazwa Kanału\". Należy to włączyć w ustawieniach webhooka Mattermost. Np.: #inny-kanał", + aboutMattermostChannelName: "Możesz zastąpić domyślny kanał, na którym publikowane są posty webhooka, wpisując nazwę kanału w polu \"Nazwa kanału\". Należy to włączyć w ustawieniach webhooka Mattermost. Np.: #inny-kanał", matrix: "Matrix", - promosmsTypeEco: "SMS ECO - Tanie, lecz wolne. Dostępne tylko w Polsce", - promosmsTypeFlash: "SMS FLASH - Wiadomość automatycznie wyświetli się na urządzeniu. Dostępne tylko w Polsce.", - promosmsTypeFull: "SMS FULL - Szybkie i dostępne międzynarodowo. Wersja premium usługi, która pozwala min. ustawić własną nazwę nadawcy.", - promosmsTypeSpeed: "SMS SPEED - Wysyłka priorytetowa, posiada wszystkie zalety SMS FULL", - promosmsPhoneNumber: "Numer Odbiorcy", - promosmsSMSSender: "Nadawca SMS (Wcześniej zatwierdzone nazwy z panelu PromoSMS)", + promosmsTypeEco: "SMS ECO - tanie, lecz wolne. Dostępne tylko w Polsce", + promosmsTypeFlash: "SMS FLASH - wiadomość automatycznie wyświetli się na urządzeniu. Dostępne tylko w Polsce.", + promosmsTypeFull: "SMS FULL - szybkie i dostępne międzynarodowo. Wersja premium usługi, która pozwala min. ustawić własną nazwę nadawcy.", + promosmsTypeSpeed: "SMS SPEED - wysyłka priorytetowa, posiada wszystkie zalety SMS FULL", + promosmsPhoneNumber: "Numer odbiorcy", + promosmsSMSSender: "Nadawca SMS (wcześniej zatwierdzone nazwy z panelu PromoSMS)", "Primary Base URL": "Główny URL", "Push URL": "Push URL", needPushEvery: "Powinieneś wywoływać ten URL co {0} sekund", From 4d3d6d6e259a92352982b39ab22333185614062d Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 31 Oct 2021 21:59:56 +0100 Subject: [PATCH 17/31] Missing this... --- src/languages/pl.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/languages/pl.js b/src/languages/pl.js index 1144d4ebe..082980d3b 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -185,8 +185,8 @@ export default { telegram: "Telegram", "Bot Token": "Token bota", wayToGetTelegramToken: "Token można uzyskać z {0}.", - "Chat ID": "Identyfikator Czatu", - supportTelegramChatID: "Czat wsprarcia technicznego / Bezpośrednia Rozmowa / Czat Grupowy", + "Chat ID": "Identyfikator czatu", + supportTelegramChatID: "Czat wsparcia technicznego / Bezpośrednia rozmowa / Czat grupowy", wayToGetTelegramChatID: "Możesz uzyskać swój identyfikator czatu, wysyłając wiadomość do bota i przechodząc pod ten adres URL, aby wyświetlić identyfikator czatu:", "YOUR BOT TOKEN HERE": "TWOJ TOKEN BOTA", chatIDNotFound: "Identyfikator czatu nie znaleziony, najpierw napisz do bota", @@ -205,7 +205,7 @@ export default { smtpBCC: "UDW", discord: "Discord", "Discord Webhook URL": "URL webhook Discorda", - wayToGetDiscordURL: "Możesz go uzyskać przechodząc do Ustawienia Serwera -> Integracje -> Tworzenie Webhooka", + wayToGetDiscordURL: "Możesz go uzyskać przechodząc do Ustawienia serwera -> Integracje -> Tworzenie webhooka", "Bot Display Name": "Wyświetlana nazwa bota", "Prefix Custom Message": "Własny początek wiadomości", "Hello @everyone is...": "Hej {'@'}everyone ...", @@ -227,8 +227,8 @@ export default { "Channel Name": "Nazwa kanału", "Uptime Kuma URL": "Adres Uptime Kuma", aboutWebhooks: "Więcej informacji na temat webhooków: {0}", - aboutChannelName: "Podaj nazwę kanału {0} w polu Nazwa Kanału, jeśli chcesz pominąć kanał webhooka. Np.: #inny-kanal", - aboutKumaURL: "Jeśli pozostawisz pole Adres Uptime Kuma puste, domyślnie będzie to strona projektu na Github.", + aboutChannelName: "Podaj nazwę kanału {0} w polu Nazwa kanału, jeśli chcesz pominąć kanał webhooka. Np.: #inny-kanal", + aboutKumaURL: "Jeśli pozostawisz pole Adres Uptime Kuma puste, domyślnie będzie to strona projektu na GitHub.", emojiCheatSheet: "Ściąga emoji: {0}", "rocket.chat": "Rocket.chat", pushover: "Pushover", @@ -270,7 +270,7 @@ export default { "Messaging API": "API wiadomości", wayToGetLineChannelToken: "Najpierw uzyskaj dostęp do {0}, utwórz dostawcę i kanał (Messaging API), a następnie możesz uzyskać token dostępu do kanału i identyfikator użytkownika z wyżej wymienionych pozycji menu.", "Icon URL": "Adres Ikony", - aboutIconURL: "Możesz podać link do zdjęcia w \"Adres URL ikony\", aby zastąpić domyślne zdjęcie profilowe. Nie będzie używany, jeśli ustawiona jest ikona Emoji.", + aboutIconURL: "Możesz podać link do zdjęcia w \"Adres URL ikony\", aby zastąpić domyślne zdjęcie profilowe. Nie będzie używany, jeśli ustawiona jest ikona emoji.", aboutMattermostChannelName: "Możesz zastąpić domyślny kanał, na którym publikowane są posty webhooka, wpisując nazwę kanału w polu \"Nazwa kanału\". Należy to włączyć w ustawieniach webhooka Mattermost. Np.: #inny-kanał", matrix: "Matrix", promosmsTypeEco: "SMS ECO - tanie, lecz wolne. Dostępne tylko w Polsce", 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 18/31] 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 60e12f4bfa55f10b0f5d90e3a6f87bf94e2cdb96 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 2 Nov 2021 01:13:05 +0800 Subject: [PATCH 19/31] fix healthcheck.js with prefix UPTIME_KUMA_ --- extra/healthcheck.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/extra/healthcheck.js b/extra/healthcheck.js index 99f748fb5..8044f654f 100644 --- a/extra/healthcheck.js +++ b/extra/healthcheck.js @@ -1,19 +1,35 @@ /* * This script should be run after a period of time (180s), because the server may need some time to prepare. */ +const { FBSD } = require("../server/util-server"); + process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; let client; -if (process.env.SSL_KEY && process.env.SSL_CERT) { +const sslKey = process.env.UPTIME_KUMA_SSL_KEY || process.env.SSL_KEY || undefined; +const sslCert = process.env.UPTIME_KUMA_SSL_CERT || process.env.SSL_CERT || undefined; + +if (sslKey && sslCert) { client = require("https"); } else { client = require("http"); } +// If host is omitted, the server will accept connections on the unspecified IPv6 address (::) when IPv6 is available and the unspecified IPv4 address (0.0.0.0) otherwise. +// Dual-stack support for (::) +let hostname = process.env.UPTIME_KUMA_HOST; + +// Also read HOST if not FreeBSD, as HOST is a system environment variable in FreeBSD +if (!hostname && !FBSD) { + hostname = process.env.HOST; +} + +const port = parseInt(process.env.UPTIME_KUMA_PORT || process.env.PORT || 3001); + let options = { - host: process.env.HOST || "127.0.0.1", - port: parseInt(process.env.PORT) || 3001, + host: hostname || "127.0.0.1", + port: port, timeout: 28 * 1000, }; From 83ee46454a86f5d4b2e477b8972ced7d96f583b7 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 2 Nov 2021 13:12:46 +0800 Subject: [PATCH 20/31] 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 21/31] 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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:24:15 +0800 Subject: [PATCH 22/31] 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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:25:34 +0800 Subject: [PATCH 23/31] 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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:30:13 +0800 Subject: [PATCH 24/31] 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]: <title>" 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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:30:39 +0800 Subject: [PATCH 25/31] 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>" +title: "[Help] " labels: [help] body: - type: checkboxes From df80f413b5bc95cd315607c36fce72fd3b629e35 Mon Sep 17 00:00:00 2001 From: Louis Lam <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:31:19 +0800 Subject: [PATCH 26/31] 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>" +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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:31:27 +0800 Subject: [PATCH 27/31] 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 c094dc0c5bd36c691869fcdc907ab87d52bf8ea9 Mon Sep 17 00:00:00 2001 From: Louis Lam <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 21:48:46 +0800 Subject: [PATCH 28/31] 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 <louislam@users.noreply.github.com> Date: Tue, 2 Nov 2021 22:03:02 +0800 Subject: [PATCH 29/31] 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 dee131c25d64d36ad0b7de7cbb46bb61a86c710f Mon Sep 17 00:00:00 2001 From: Louis Lam <louislam@users.noreply.github.com> Date: Wed, 3 Nov 2021 13:02:44 +0800 Subject: [PATCH 30/31] 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 <louislam@users.noreply.github.com> Date: Wed, 3 Nov 2021 13:03:36 +0800 Subject: [PATCH 31/31] 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",