Commit Graph

1905 Commits

Author SHA1 Message Date
iotux
1faed64e13 Merge remote-tracking branch 'upstream/master' into feature/local-service-monitor 2026-01-01 12:11:27 +01:00
iotux
2c47174a04 Merge branch 'feature/local-service-monitor' of https://github.com/iotux/uptime-kuma into feature/local-service-monitor 2026-01-01 09:55:14 +01:00
iotux
97d836d7f4 Modified according to review 2026-01-01 09:41:24 +01:00
iotux
6bc382ef4d
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:41:09 +01:00
iotux
f3c554d0ec
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:37:42 +01:00
iotux
6c93930d3e
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:35:59 +01:00
iotux
2dbd8aecf2
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:34:47 +01:00
Frank Elsinga
bcdf6b8959
Merge branch 'master' into websocket_test 2026-01-01 08:25:14 +01:00
iotux
c09882b00a
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:19:55 +01:00
iotux
134877317c
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:18:05 +01:00
iotux
132a03874d
Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:03:57 +01:00
Pedro Magno
414fc5612a
Merge branch 'master' into feature/mssql-monitor 2026-01-01 01:37:47 +00:00
PoleTransformer
88b9283051
Merge branch 'master' into websocket_test 2025-12-31 18:20:30 +00:00
PoleTransformer
8594bc81b3 Enforce backend WS timeout + subprotocol logic + formatting 2025-12-31 09:51:53 -08:00
lsnnt
55d21b72ba not checked lint now checked lint and the backend test to see everything working 2025-12-31 11:02:17 +05:30
lsnnt
6c3afcca08 added direct text support for countering xss and test were also failing 2025-12-31 10:55:23 +05:30
lsnnt
bdf499edd2 Added the Dompurify to sanitize html content 2025-12-31 10:44:23 +05:30
PoleTransformer
20e2cf69e4 Add timeout selection + refine error logic + update tests 2025-12-30 20:29:55 -08:00
Nityanand Thakur
f74834e4ca
Update server/notification-providers/resend.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-31 09:54:20 +05:30
PoleTransformer
a2c81ebf44 minor patch 2025-12-30 17:57:29 -08:00
PoleTransformer
0bee90ea31 WS test status code support + improved error handing + subprotocol input 2025-12-30 17:49:09 -08:00
Nityanand Thakur
49273f94ef
Merge branch 'master' into master 2025-12-30 18:44:40 +05:30
iotux
1d118b4852
Merge branch 'louislam:master' into feature/local-service-monitor 2025-12-30 19:53:40 +07:00
Pedro Magno
e62008cfb0
Merge branch 'master' into feature/mssql-monitor 2025-12-30 11:16:42 +00:00
Pedro Magno
534ba5d547 chore: Extract the sqlserver monitor to its own monitor-type. Enable support conditions for a single result value. 2025-12-30 11:06:04 +00:00
lsnnt
761ef68c29 fixed something and added resend in en.json 2025-12-30 13:15:33 +05:30
xNewz
7ef7abe6be fix: remove accidental websocket changes 2025-12-30 14:15:21 +07:00
lsnnt
7578f55b94 Added the notification provider 2025-12-30 12:30:26 +05:30
xNewz
7e74579312 Handle websocket errors with missing messages 2025-12-30 07:52:49 +07:00
xNewz
76283148ba Remove LINE Notify provider 2025-12-30 07:41:30 +07:00
iotux
fcdc22a661
Merge branch 'louislam:master' into feature/local-service-monitor 2025-12-24 12:20:14 +07:00
Anthony
b6e8d548b0
fix: update dns monitor to evaluate full response list on CAA resolver_type (#6520) 2025-12-24 03:36:28 +01:00
iotux
b64bf50379
Merge branch 'master' into feature/local-service-monitor 2025-12-23 19:27:43 +07:00
iotux
97ba9e46e3 Removed dropdown in UI, and some template/i18n cleanups 2025-12-23 12:18:33 +01:00
Shengqi Chen
d23ff8c486
fix: v2 migration process report is always 0 when having many monitors / dates (#6516)
Signed-off-by: Shengqi Chen <i@harrychen.xyz>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-22 14:31:39 +00:00
Copilot
2d9e6c3911
fix: MariaDB datetime format error when pausing maintenance (#6513)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: louislam <1336778+louislam@users.noreply.github.com>
Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
2025-12-22 14:32:12 +01:00
iotux
3591f41ee6
Merge branch 'master' into feature/local-service-monitor 2025-12-21 15:05:08 +07:00
Shaan
eb0b6cdb09
feat: Domain name expiry (#6413)
Co-authored-by: AiroPi <47398145+AiroPi@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-20 16:32:49 +00:00
iotux
73a19df90c
Merge branch 'master' into feature/local-service-monitor 2025-12-20 22:17:46 +07:00
iotux
8189623389 Added timeout to system commands to prevent zombie processes 2025-12-20 16:02:38 +01:00
iotux
15de932623 Cleanup comments and switch to integration tests 2025-12-20 15:19:06 +01:00
Shaan
f3c76dbc6f
feat: Add XMPP dialog in STARTTLS routine (#6508) 2025-12-20 12:35:53 +00:00
benji2k2
22a0ed6061
fix(docker): handle the state "unhealthy" as DOWN instead of PENDING (#6292)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-20 09:26:13 +00:00
iotux
b7573cf917 Replaced regex filtering in checkWindows 2025-12-20 05:14:17 +01:00
iotux
4639dc54bd Added space to filter regex 2025-12-19 16:12:58 +01:00
iotux
3e2f489d8b Moved input filter to checkLinux and checkWindows functions 2025-12-19 14:33:10 +01:00
iotux
b33188ebfe
Merge branch 'master' into feature/local-service-monitor 2025-12-18 09:56:59 +07:00
iotux
5d955f954b
feat: add platform/arch information to sendInfo (#6497)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-18 02:53:47 +00:00
iotux
77d0e73878 Resolve merge conflict in server/server.js and server/uptime-kuma-server.js 2025-12-17 17:49:59 +01:00
iotux
3b0ab450d3
fix: tags are not saved if you don't save 2 times (#6491) 2025-12-17 11:50:28 +01:00