From 1f29fabe6410ba25cfea2ce65c52df84251dfc01 Mon Sep 17 00:00:00 2001 From: ZaneL1u Date: Thu, 7 Sep 2023 16:15:21 +0800 Subject: [PATCH 01/10] fix: fix the judgment condition of Tailscale (#3701) --- src/pages/EditMonitor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue index a5fbb4ca..00b1787d 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -82,7 +82,7 @@ - From 0af4ee6c3426538d5db42732886979ff3d92ad61 Mon Sep 17 00:00:00 2001 From: Nelson Chan <3271800+chakflying@users.noreply.github.com> Date: Sun, 10 Sep 2023 01:54:03 +0800 Subject: [PATCH 02/10] Fix: Missing await for isActive (#3717) --- server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 25a7d472..db43f744 100644 --- a/server/server.js +++ b/server/server.js @@ -796,7 +796,7 @@ let needSetup = false; await updateMonitorNotification(bean.id, monitor.notificationIDList); - if (bean.isActive()) { + if (await bean.isActive()) { await restartMonitor(socket.userID, bean.id); } From 1e12ca4786608e3c8143829040ecc9d93a2283ec Mon Sep 17 00:00:00 2001 From: Nelson Chan <3271800+chakflying@users.noreply.github.com> Date: Sat, 16 Sep 2023 05:11:18 +0800 Subject: [PATCH 03/10] Fix: Disable save button on submit (#3729) --- src/pages/StatusPage.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index 606d9657..bc61aa58 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -102,7 +102,7 @@
- @@ -438,6 +438,7 @@ export default { lastUpdateTime: dayjs(), updateCountdown: null, updateCountdownText: null, + loading: false, }; }, computed: { @@ -806,6 +807,7 @@ export default { /** Save the status page */ save() { + this.loading = true; let startTime = new Date(); this.config.slug = this.config.slug.trim().toLowerCase(); @@ -823,10 +825,12 @@ export default { } setTimeout(() => { + this.loading = false; location.href = "/status/" + this.config.slug; }, time); } else { + this.loading = false; toast.error(res.msg); } }); From 33804d8823704a7275138db5e9d4769847c25c3c Mon Sep 17 00:00:00 2001 From: Henrik Gerdes Date: Fri, 15 Sep 2023 23:13:20 +0200 Subject: [PATCH 04/10] fix: respect the user defined oauth2 auth method (#3727) --- server/server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/server.js b/server/server.js index db43f744..305077f5 100644 --- a/server/server.js +++ b/server/server.js @@ -726,11 +726,11 @@ let needSetup = false; bean.basic_auth_user = monitor.basic_auth_user; bean.basic_auth_pass = monitor.basic_auth_pass; bean.timeout = monitor.timeout; - bean.oauth_client_id = monitor.oauth_client_id, - bean.oauth_client_secret = monitor.oauth_client_secret, - bean.oauth_auth_method = this.oauth_auth_method, - bean.oauth_token_url = monitor.oauth_token_url, - bean.oauth_scopes = monitor.oauth_scopes, + bean.oauth_client_id = monitor.oauth_client_id; + bean.oauth_client_secret = monitor.oauth_client_secret; + bean.oauth_auth_method = monitor.oauth_auth_method; + bean.oauth_token_url = monitor.oauth_token_url; + bean.oauth_scopes = monitor.oauth_scopes; bean.tlsCa = monitor.tlsCa; bean.tlsCert = monitor.tlsCert; bean.tlsKey = monitor.tlsKey; From ff51704cdfcc7853076a62e67b8fc33cfd04c17a Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 17 Sep 2023 02:40:08 +0800 Subject: [PATCH 05/10] Fix #3712 --- server/model/monitor.js | 15 ++++++++++++++- src/components/PublicGroupList.vue | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 1cea3553..6a456acf 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -53,7 +53,7 @@ class Monitor extends BeanModel { obj.tags = await this.getTags(); } - if (certExpiry && this.type === "http") { + if (certExpiry && this.type === "http" && this.getURLProtocol() === "https:") { const { certExpiryDaysRemaining, validCert } = await this.getCertExpiry(this.id); obj.certExpiryDaysRemaining = certExpiryDaysRemaining; obj.validCert = validCert; @@ -1075,6 +1075,19 @@ class Monitor extends BeanModel { } } + /** + * Example: http: or https: + * @returns {(null|string)} + */ + getURLProtocol() { + const url = this.getUrl(); + if (url) { + return this.getUrl().protocol; + } else { + return null; + } + } + /** * Store TLS info to database * @param checkCertificateResult diff --git a/src/components/PublicGroupList.vue b/src/components/PublicGroupList.vue index ba2230f0..5fd09fca 100644 --- a/src/components/PublicGroupList.vue +++ b/src/components/PublicGroupList.vue @@ -62,7 +62,7 @@
-
+
From 86fa57449e15c696cdafc7dff11ee2c2e88a5bda Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 17 Sep 2023 02:56:19 +0800 Subject: [PATCH 06/10] Fix #3596 --- src/components/HeartbeatBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HeartbeatBar.vue b/src/components/HeartbeatBar.vue index 8323f7cf..11940c7a 100644 --- a/src/components/HeartbeatBar.vue +++ b/src/components/HeartbeatBar.vue @@ -11,7 +11,7 @@ />
{{ timeSinceFirstBeat }} ago
From f98a1ce077ba77637c9b57f2354a3fd884700a2f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 17 Sep 2023 20:32:49 +0800 Subject: [PATCH 07/10] Ignore some build files --- .dockerignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3e6ef3fe..0cd18a22 100644 --- a/.dockerignore +++ b/.dockerignore @@ -34,8 +34,9 @@ tsconfig.json /ecosystem.config.js /extra/healthcheck.exe /extra/healthcheck -extra/exe-builder - +/extra/exe-builder +/extra/push-examples +/extra/uptime-kuma-push ### .gitignore content (commented rules are duplicated) From d8a8f6c08bce05529e3d8bca858b380fbc15685b Mon Sep 17 00:00:00 2001 From: "FC (Fay) Stegerman" Date: Sun, 17 Sep 2023 12:39:07 +0000 Subject: [PATCH 08/10] EditMonitor: add missing config UI for json-query (#3751) --- 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 00b1787d..b65a7fc3 100644 --- a/src/pages/EditMonitor.vue +++ b/src/pages/EditMonitor.vue @@ -401,7 +401,7 @@
-
+
@@ -460,7 +460,7 @@
-