Commit graph

4954 commits

Author SHA1 Message Date
Ikko Eltociear Ashimine
2ad8af9d14
Minor (#4104)
infomation -> information
2023-11-25 22:08:21 +08:00
Louis Lam
5bc8c0c66f
Merge 1.23.7 (#4102)
1.23.x merge to 2.x.x
2023-11-25 03:32:12 +08:00
Louis Lam
60be875edd Fix a merge issue 2023-11-25 03:28:45 +08:00
Louis Lam
676587b7fb Merge package-lock.json 2023-11-25 03:25:50 +08:00
Louis Lam
e9bf02fc2c Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
2023-11-25 03:25:03 +08:00
Louis Lam
73239d441d Update to 1.23.7 2023-11-24 18:49:27 +08:00
Louis Lam
4ceeb304f1 Add a script to prepare a changelog 2023-11-24 18:44:54 +08:00
Nelson Chan
67250d6302
Feat: Retries persistence (#3814)
* Feat: Retries persistence

* Fix: Set duration for first beat of push monitor

* Feat: Update UptimeCalculator in push route

* Fix: Handle resend in push route

* Chore: Remove debug log
2023-11-24 18:11:36 +08:00
Louis Lam
711380bbbe
Merge pull request #4095 from louislam/update-3
Rewrite Tailscale ping using spawnSync
2023-11-24 17:44:24 +08:00
Louis Lam
9536c6aa6a Minor 2023-11-24 17:33:13 +08:00
Louis Lam
4255496b11 Rewrite Tailscale ping using spawnSync 2023-11-24 17:29:42 +08:00
Louis Lam
f28dccf4e1
Merge pull request from GHSA-v4v2-8h88-65qj 2023-11-24 17:18:01 +08:00
Louis Lam
b689733d59 Fix getGameList, testChrome without checkLogin 2023-11-24 16:37:52 +08:00
Louis Lam
afaa7bb2f0 Do not process debug log for production 2023-11-24 16:03:35 +08:00
Adam Hancock
ac452bbcb9
Zoom in on real browser screenshot (#3925)
* Screenshot in modal

* Update src/components/ScreenshotDialog.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/Details.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Added title

* Update ScreenshotDialog.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Add translations

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-11-24 02:58:33 +08:00
Louis Lam
121d1a11af
Revert "Restart running monitors if no heartbeat (#3952)" (#4088)
This reverts commit c43223a16d.
2023-11-24 02:23:38 +08:00
Louis Lam
8e61158758
Close the client postgresql connection after rejection. (#4084)
Co-authored-by: Manuel Vázquez Acosta <manuel@merchise.org>
2023-11-22 19:50:03 +08:00
Louis Lam
dc42420193 Change version to 2.0.0-dev 2023-11-22 19:35:56 +08:00
Louis Lam
d810a74d70
Move rootless images to an another set (#4052) 2023-11-22 16:12:15 +08:00
Louis Lam
bf58838b89
+10 seconds for Abort signal (#4053)
* Debug only

* Remove debug
2023-11-22 16:03:03 +08:00
Nelson Chan
33ce0ef02c
Fix: Improve error message on timeout (#4054)
* Fix: Improve error message on timeout

* Chore: Format
2023-11-21 23:56:17 +08:00
Louis Lam
1550a5f792
Merge pull request #4064 from louislam/1.23.X-merge-to-2.X.X
1.23.x merge to 2.x.x
2023-11-20 14:50:37 +08:00
Louis Lam
92e0eec6d4 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
# Conflicts:
#	package.json
#	server/model/monitor.js
2023-11-20 14:49:45 +08:00
Louis Lam
9973d73dd7 Fix a merge issue 2023-11-20 14:48:20 +08:00
Rakibul Yeasin
e2782810cf
fix: Clickable link monitors aren't underlined when editing status page (#3820) 2023-11-20 14:45:34 +08:00
Louis Lam
c1aaad0d85 Update to 1.23.6 2023-11-18 11:37:14 +08:00
Louis Lam
954e05b72f Fix #4051 2023-11-18 11:33:34 +08:00
Louis Lam
2918f723c9
Merge pull request #4050 from louislam/1.23.X-merge-to-2.X.X
1.23.x merge to 2.x.x
2023-11-18 01:38:35 +08:00
Louis Lam
2aa15ea635 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
# Conflicts:
#	server/database.js
2023-11-18 01:37:30 +08:00
Louis Lam
6d4a45f18c Update to 1.23.5 2023-11-18 01:23:53 +08:00
Louis Lam
f0975cd929
Should be a final ulitmate fix for request timeout issue (#4045)
* Try to fix timeout again

* Ops
2023-11-18 01:17:54 +08:00
Louis Lam
40d6a21453
Fix kafka migration script again (#4043) 2023-11-17 15:21:29 +08:00
Louis Lam
b383392e8f
Remains Node.js 16' SSL behavior for 1.23.X (#4044) 2023-11-17 15:21:08 +08:00
Nelson Chan
9964b6c4d8
Fix: Update monitor object on pause (#4032) 2023-11-16 20:41:35 +08:00
William Harrison
2547515a37
feat: grammar fixes (#4042)
* feat: grammar fixes

* Update PULL_REQUEST_TEMPLATE.md
2023-11-16 20:31:20 +08:00
Louis Lam
014231ef86
Merge pull request #3883 from louislam/1.23.X-merge-to-2.X.X
Merge 1.23.4 changes to 2.0.0
2023-11-13 21:26:40 +08:00
Louis Lam
188fdcb6ad Merge branch 'master' into 1.23.X-merge-to-2.X.X
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
2023-11-13 21:25:49 +08:00
Louis Lam
0f980e97b1 Merge dependencies 2023-11-13 21:25:00 +08:00
Louis Lam
65cbc7b318 Migrate kafka_producer patch 2023-11-13 21:19:43 +08:00
Louis Lam
ace1fe00c2 Merge branch 'master' into 1.23.X-merge-to-2.X.X
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/uptime-kuma-server.js
#	server/util-server.js
2023-11-13 21:15:51 +08:00
Louis Lam
d56bf08cd7 Update to 1.23.4 2023-11-13 15:23:32 +08:00
Louis Lam
291d5d7c55 Update dependencies 2023-11-13 15:22:51 +08:00
Louis Lam
8e3ff25f7b
Followup #3864, rebase for 1.23.x (#4016)
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2023-11-12 20:32:40 +08:00
Louis Lam
6e80c850f4
Should be an ulitmate fix for request timeout issue (#4011) 2023-11-12 13:50:51 +08:00
Muhammed Hussein karimi
0608881954
🐛 fix: kafka producer booleans migration null values (#3984)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
2023-11-10 00:32:54 +08:00
Nelson Chan
38efd97b28
Fix: Support float ping in push route (#3987) 2023-11-09 23:39:44 +08:00
Nelson Chan
5b6522a54e
Fix: entryPage setting can be null (#3994) 2023-11-08 20:46:10 +08:00
Nelson Chan
b534fde265
Fix: Use ActionSelect for Docker Host & validate input (#3864)
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead
2023-11-03 21:25:28 +08:00
Louis Lam
ce0ba6c0ca
Fix/axios abort signal for 1.23.X (#3971)
* Fix: Add axios abort signal

* Chore: Fix comment

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2023-11-01 10:10:48 +08:00
Nelson Chan
fdfb572e09
Fix: Add axios abort signal (#3961)
* Fix: Add axios abort signal

* Chore: Fix comment
2023-11-01 09:48:13 +08:00