undaunt
2dc3e1ab1f
Fix concurrent stat insertion duplicate key errors
...
This commit resolves duplicate key errors that occur when multiple monitors
attempt to insert statistics simultaneously into stat_* tables.
The fix addresses three interconnected issues:
1. **Circular Dependency Resolution**: database.js imports UptimeCalculator at
module level, but UptimeCalculator needs Database.dbConfig. Fixed by using
local imports in UptimeCalculator methods to ensure Database.dbConfig is
properly initialized when accessed.
2. **Database Configuration Initialization**: Database.dbConfig was not set
in the catch block when db-config.json is missing, causing undefined access
errors. Fixed by ensuring Database.dbConfig is always set.
3. **Schema Column Naming Mismatch**: RedBean ORM uses camelCase (pingMin/pingMax)
but Knex migrations create snake_case columns (ping_min/ping_max). Fixed by
using correct snake_case column names in SQL queries.
4. **Atomic Upsert Operations**: Implemented database-specific upsert logic:
- SQLite: INSERT ... ON CONFLICT DO UPDATE
- MariaDB: INSERT ... ON DUPLICATE KEY UPDATE
The solution maintains backward compatibility by falling back to R.store()
when upsert fails, ensuring no data loss while eliminating race conditions
for users with many monitors (200+).
Fixes #5357
2025-06-17 22:41:41 -07:00
undaunt
19889a57b2
Fix concurrent stat insertions causing duplicate key errors
...
Resolves issue where multiple monitors updating statistics simultaneously
can cause "Duplicate entry" database errors for the same monitor_id and
timestamp combination in stat_hourly and stat_daily tables.
Changes:
- Add database-specific upsert logic for SQLite and MariaDB
- Replace R.store() calls with atomic upsert operations
- Add fallback to original R.store() if upsert fails
- Initialize default values for new stat beans to prevent null conflicts
- Use ON CONFLICT/ON DUPLICATE KEY UPDATE for atomic stat updates
This fix is particularly important for high-volume monitoring scenarios
with 400+ monitors where concurrent heartbeats can trigger race conditions
in the stat insertion process.
Fixes #5357
2025-06-17 21:27:17 -07:00
Florian Feka
55817061c0
fix: Properly handle the NTLM part being embedded inside other authentication headers ( #5871 )
...
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-13 15:08:11 +02:00
warpreality
18cfa901ad
feat: Add a "manual" (static/fixed) monitor ( #5897 )
...
Co-authored-by: Maksim Kachynski <max.kachinsky@rocketdata.io>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-13 13:38:49 +02:00
Fabian Triebsch
f282422b22
added option to force ipv4 or ipv6 for http(s) monitor type ( #5880 )
...
Co-authored-by: Ionys <9364594+Ionys320@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-13 08:14:55 +02:00
Manu
53e83e7722
Add monitor id label to prometheus metrics ( #5907 )
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
2025-06-12 12:31:01 +02:00
grvwy
8909cd008c
feat: add multiple tags in bulk for a monitor ( #5846 )
...
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-12 03:52:35 +02:00
Ionys
c7bacbb7fe
Ensure maintenance are always runned at the right moment ( #5903 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-12 01:42:25 +02:00
Ionys
4d51aaa6f8
Fix invalid maintenance date ( #5901 )
2025-06-12 00:28:04 +02:00
Andrea Mastellone
f27811c394
ntfy.sh separate down priority ( #5893 )
...
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-11 01:41:09 +02:00
Cyril59310
c46772dafc
Add default avatar in discord notifications ( #5890 )
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2025-06-07 21:09:56 +02:00
Louis Lam
dcff640248
Fix ( #5875 )
...
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
Co-authored-by: ptrstr <ptrstr@protonmail.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-04 10:04:57 +08:00
Damon
c0598ac606
Flashduty IntegrationKey support Endpoint URL ( #5859 )
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2025-05-29 13:54:07 +02:00
Filippo
839ead80cc
Enhanced ping monitor with advanced options (count, timeout, numeric) ( #5588 )
...
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-24 02:57:39 +02:00
Louis Lam
49eb0ff87b
Fix: [Push Monitor] Send notifications during maintenance period ( #5847 )
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2025-05-20 12:38:21 +02:00
Brad Koehn
c67f6efe29
added SMTP monitor ( #5489 )
...
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-18 22:35:55 +02:00
zhang-wei
289e824a5d
Fix monitor reference in push notification logic ( #5842 )
...
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-18 00:05:48 +02:00
Đăng Khoa
0b29fd49ad
fix(sql): use UTC_TIMESTAMP instead of NOW for consistent time calcul… ( #5843 )
2025-05-17 23:33:00 +02:00
Martin Hjärtmyr
cd6dc144a7
feat: add notification provider Notifery ( #5832 )
...
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
validate / validate (push) Has been cancelled
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-11 15:38:03 +02:00
Ionys
2b3f49a266
Add a public URL field for monitors and uses it on the status page ( #5435 )
...
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
validate / json-yaml-validate (push) Waiting to run
validate / validate (push) Waiting to run
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2025-05-10 19:05:37 +02:00
Pargorn Ruasijan
eb18677e4f
fixed : #5564 slack notifications no preview available ( #5824 )
2025-05-07 22:29:27 +02:00
Cyril59310
76c382f229
Add disable url option in notification Discord ( #5817 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-06 01:33:49 +02:00
vapao
32d92eccfa
Update SpugPush notification payload ( #5816 )
2025-05-04 14:42:40 +02:00
vapao
6a5011ad34
Add SpugPush notification provider ( #5813 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-02 08:58:16 +02:00
youpie
b22969a3e6
Allow HTML for custom email bodies ( #5635 )
2025-05-01 19:36:34 +02:00
Pargorn Ruasijan
8396330552
Add OneChat notification provider ( #5546 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-27 18:48:05 +02:00
Aleksander
e7d3fa6a78
Update SMSEagle support adding APIv2 and calls integration ( #5756 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-27 18:37:23 +02:00
II-EMC
b3a11a4d9d
fix: Add name to preparePreloadData call in sendNotification as a better fix for #5760 ( #5769 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-27 18:30:18 +02:00
Ruse
27f808448f
Pushover add UP/DOWN status sounds ( #5426 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Moqavem <sina.farahabadi@gmail.com>
2025-04-26 23:01:21 +02:00
Jan K.
33f253f825
Added Pumble Notification ( #5781 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-26 22:53:40 +02:00
Dawid
f6444aacd2
feat: Support SMSPlanet notification provider ( #5800 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-26 22:33:26 +02:00
Ryo Hanafusa
3b58ac3fd3
feat: Extend the length of status bar and feed sufficient data ( #5241 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-25 13:47:18 +02:00
Frank Elsinga
0876b1cbf5
chore:extracted the group monitor to a different monitoring type ( #4395 )
2025-04-22 13:14:12 +02:00
II-EMC
13a85b8200
fix: Mattermost notification provider not sending service name ( #5760 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-04-12 12:53:36 +02:00
lbriceno-tz
bdf37c5a48
fix: flat txt records before conditions check ( #5768 )
2025-04-12 12:15:28 +02:00
Teror Fox
30f82b9cb4
feat: add notification provider PushPlus ( #5716 )
...
Co-authored-by: Teror Fox <i@trfox.top>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-03-26 17:31:34 +01:00
RaminMT
b0610c02ac
Add Telegram custom bot api server support ( #5668 )
2025-03-21 04:08:20 +01:00
devlikeapro
6f8f8f955f
Add WhatsApp (WAHA) notification provider ( #5647 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-03-18 13:06:43 +01:00
Sergio Conde Gómez
9857770cc7
feat: rework notification templating and add support for telegram ( #5637 )
2025-03-14 12:51:07 +01:00
Harry
fce824f5a8
feat: Support YZJ notification provider ( #5686 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-03-14 02:40:13 +01:00
Fred Nnaji
230832c382
Update TLS expiration warning ( #5659 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-03-07 21:49:38 +01:00
希亚
784ac9ca35
Modify the "Time" in the AliyunSMS to local time. ( #5582 )
2025-02-01 00:12:09 +01:00
Boro Vukovic
20820f5a5a
chore(deps): upgrade http/https/socks proxy agents ( #5548 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-01-26 14:21:40 +01:00
zappityzap
66908c7055
chore(deps): update nostr notification provider ( #5495 )
...
Co-authored-by: zappityzap <zappityzap@proton.me>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-01-26 13:58:38 +01:00
DayShift
7a9191761d
fix: make sure that stripping backslashes for notification urls cannot cause catastophic backtracking (ReDOS) ( #5573 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-01-26 11:52:12 +01:00
Elliot Matson
7dc6191b0a
fix: add notification-fallback for better google chat popups ( #5476 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-01-24 18:49:29 +01:00
DayShift
03beef8006
BugFix:Regular Expression in parseDuration Function ( #5563 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-01-22 19:03:38 +01:00
Louis Lam
ccede11e1c
1.23.x changes to 2.0 ( #5457 )
2024-12-20 15:46:31 +08:00
Louis Lam
4d16575599
Merge branch 'master' into 1.23.X-to-2
...
# Conflicts:
# package-lock.json
# package.json
2024-12-20 15:38:45 +08:00
Louis Lam
6cfae01a0d
Merge commit from fork
...
* [V1 Only] Change dev server's data path to ./data/v1
* Fix GHSA-2qgm-m29m-cj2h
2024-12-20 15:02:22 +08:00
