Merge branch 'master' into master

BugFix:Regular Expression in parseDuration Function (#5563 )
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-02-26 13:35:56 +00:00 · 2025-01-22 20:14:10 +01:00 · 2025-01-22 19:03:38 +01:00 · 2025-01-18 23:35:40 +08:00 · 2024-12-22 13:46:13 +08:00 · 2024-12-22 13:45:19 +08:00
3 changed files with 2 additions and 2 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -32,7 +32,6 @@ tsconfig.json
 /extra/healthcheck.exe
 /extra/healthcheck
 /extra/exe-builder
-/extra/push-examples
 /extra/uptime-kuma-push

 # Comment the following line if you want to rebuild the healthcheck binary
--- a/README.md
+++ b/README.md
@ -62,6 +62,7 @@ Requirements:
 - Platform
  - ✅ Major Linux distros such as Debian, Ubuntu, CentOS, Fedora and ArchLinux etc.
  - ✅ Windows 10 (x64), Windows Server 2012 R2 (x64) or higher
+  - ❌ FreeBSD / OpenBSD / NetBSD
  - ❌ Replit / Heroku
 - [Node.js](https://nodejs.org/en/download/) 18 / 20.4
 - [npm](https://docs.npmjs.com/cli/) 9
--- a/server/modules/apicache/apicache.js
+++ b/server/modules/apicache/apicache.js
@ -485,7 +485,7 @@ function ApiCache() {
        }

        if (typeof duration === "string") {
-            let split = duration.match(/^([\d\.,]+)\s?(\w+)$/);
+            let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/);

            if (split.length === 3) {
                let len = parseFloat(split[1]);
Author	SHA1	Message	Date
Ionys	38a1c03480	Merge branch 'master' into master	2025-01-22 20:14:10 +01:00
DayShift	03beef8006	BugFix:Regular Expression in parseDuration Function (#5563 ) Some checks failed CodeQL / Analyze (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / check-linters (push) Has been cancelled Details Auto Test / e2e-test (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details Co-authored-by: Frank Elsinga <frank@elsinga.de>	2025-01-22 19:03:38 +01:00
Louis Lam	223cde831f	Fix push examples cannot be loaded (Docker only) (#5490 ) Some checks failed Auto Test / e2e-test (push) Has been cancelled Details Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled Details Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled Details Auto Test / check-linters (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details Auto Test / auto-test (18, ARM64) (push) Has been cancelled Details Auto Test / auto-test (18, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (18, windows-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ARM64) (push) Has been cancelled Details Auto Test / auto-test (20, macos-latest) (push) Has been cancelled Details Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled Details Auto Test / auto-test (20, windows-latest) (push) Has been cancelled Details	2025-01-18 23:35:40 +08:00
Louis Lam	be2faf64ce	Clarify that BSD OSs are not supported (#5465 ) Some checks failed validate / json-yaml-validate (push) Has been cancelled Details validate / validate (push) Has been cancelled Details CodeQL / Analyze (push) Has been cancelled Details Merge Conflict Labeler / Labeling (push) Has been cancelled Details	2024-12-22 13:46:13 +08:00
Louis Lam	0b76e19401	Clarify that BSD OSs are not supported	2024-12-22 13:45:19 +08:00