iotux
700eefafe4
Merge branch 'louislam:master' into feature/local-service-monitor
2026-01-02 13:04:15 +07:00
Frank Elsinga
cd874e787b
Merge branch 'master' into fix/discord-empty-service-url
2026-01-02 06:48:45 +01:00
Frank Elsinga
e4552a2184
simplify extractAddress(monitorJSON) a bit more
2026-01-02 06:47:29 +01:00
Frank Elsinga
1532acaaf3
don't call extractAddress twice
2026-01-02 06:46:50 +01:00
Frank Elsinga
f695304537
Merge branch 'master' into add-og-meta-tags
2026-01-02 06:41:04 +01:00
Frank Elsinga
6a95a88213
Update server/model/status_page.js
2026-01-02 06:40:27 +01:00
iotux
49962ebe6b
Merge branch 'louislam:master' into feature/local-service-monitor
2026-01-01 23:19:30 +07:00
Frank Elsinga
9abded0baf
fix imports
2026-01-01 16:34:05 +01:00
iotux
a6239a6200
Fixed a linting err
2026-01-01 12:18:56 +01:00
iotux
1faed64e13
Merge remote-tracking branch 'upstream/master' into feature/local-service-monitor
2026-01-01 12:11:27 +01:00
DanielDerefaka
c9381154a6
feat(status-page): add og:type and og:image Open Graph meta tags
...
Added additional Open Graph meta tags to status pages for better
social media sharing:
- og:type (set to "website")
- og:image (uses the status page icon if configured)
This complements the existing og:title and og:description tags.
Fixes #6514
2026-01-01 11:41:11 +01:00
DanielDerefaka
b16aa9c832
fix(discord): hide empty Service URL and N/A Ping fields
...
- Only show Service URL field when extractAddress returns a non-empty value
- Only show Ping field when ping value is not null
- This fixes unnecessary 'https://' and 'N/A' values showing for groups
Fixes #3327
Contribution by Gittensor, see my contribution statistics at https://gittensor.io/miners/details?githubId=101010297
2026-01-01 11:07:16 +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
