7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-10-26 08:29:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,670 Commits 14 Branches 125 Tags
e496f37b15b3ad9ebaa549b9f7f23b52a02b91dd
Commit Graph

129 Commits

Author SHA1 Message Date
Luke Thomas
cdb8ad321d fix: slug input (#5239) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-11-26 01:56:23 +01:00
Louis Lam
eca90a2b00 Revert "feat: structured logging (JSON)" (#5175) 2024-10-09 07:43:44 +08:00
Cassandra
b287a25de7 feat: structured logging (JSON) (#5118) 2024-09-24 17:51:21 +08:00
Jakob Lindskog
935194bca3 feat: implement very crude and bare-bones RSS feed (#5047) 2024-09-03 13:51:34 +02:00
Qi Zhao
4941b17a46 perf: ⚡️ revert some overengineer code 2024-06-20 10:50:35 +08:00
Qi Zhao
58533e8f06 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
3f425dc160 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
f63d36478d Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
7270caccae Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
53c4bba387 fix: 🐛 badge requestedDuration 2024-06-20 10:50:35 +08:00
Qi Zhao
e5ff86e6ac fix: 🐛 status & ping badge duration 2024-06-20 10:50:35 +08:00
Stefan Ottosson
9c7aa13190 fix: remove check that method is correct 2024-05-24 08:29:09 +02:00
Stefan Ottosson
1ac5696463 Merge branch 'master' into feature/http-method-push-monitor 
# Conflicts:
#	src/pages/EditMonitor.vue
 2024-05-23 17:34:45 +02:00
Nelson Chan
c7b8bb9e4a Fix: Incorrect handling of status page not found (#4537) 2024-02-28 18:57:58 +08:00
Louis Lam
869ee8ec50 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts
 2023-12-11 02:13:47 +08:00
Louis Lam
482049c72b Merge pull request from GHSA-88j4-pcx8-q4q3 
* WIP, still need to handle npm run reset-password

* Implement it for "npm run reset-password"

Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js

* Minor
 2023-12-10 20:40:40 +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
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
Nelson Chan
38efd97b28 Fix: Support float ping in push route (#3987) 2023-11-09 23:39:44 +08:00
Louis Lam
852b3fa61b Merge branch '1.23.X' 
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/server.js
#	server/util-server.js
 2023-10-09 21:28:01 +08:00
前端小武
1b148786a5 Fix: Update x-forwarded-host field when using reverse proxy (#3726) 2023-10-09 06:31:52 +08:00
Adam Stachowicz
6875ecdfbf Fix warnings (#3826) 2023-10-03 05:39:17 +08:00
Louis Lam
076331bf00 Uptime calculation improvement and 1-year uptime (#2750) 2023-09-01 05:19:21 +08:00
Louis Lam
a0bd4b248b Merge remote-tracking branch 'origin/master' into 2.0.X 
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	package.json
#	server/database.js
#	src/router.js
 2023-07-30 19:15:09 +08:00
Louis Lam
345e61abca Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders 
# Conflicts:
#	package-lock.json
#	package.json
 2023-07-15 01:05:34 +08:00
Louis Lam
fe40d819bd Update send403 to sendHttpError 2023-07-08 21:34:58 +08:00
Louis Lam
3dbd8277f0 Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge 
# Conflicts:
#	.gitignore
 2023-07-08 21:28:57 +08:00
Louis Lam
16a1a66e09 Merge remote-tracking branch 'origin/master' into 2.0.X 
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/debian-base.dockerfile
#	docker/dockerfile
#	package.json
#	server/database.js
#	server/jobs/util-worker.js
#	server/model/maintenance.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/uptime-kuma-server.js
 2023-06-30 13:38:56 +08:00
Nelson Chan
3e5e7e6e32 Fix: Incorrect options for cert-exp badge 2023-06-29 07:12:19 +08:00
Louis Lam
2e2747fb52 Handling DATE_ADD 2023-06-27 20:57:34 +08:00
Louis Lam
32f84b5e4e Merge pull request #2491 from RubenNL/fix-metrics-push 
Fixed the metrics for the push type.
 2023-04-02 02:05:03 +08:00
Louis Lam
fbdeb30ce7 Merge pull request #2973 from chakflying/fix/limit-precision 
Fix: Apply toPrecision as last step
 2023-03-26 15:46:00 +08:00
Nelson Chan
4f05912276 Fix: Allow status badge with empty label 2023-03-25 02:44:15 +08:00
Nelson Chan
bf525371d9 Fix: Apply toPrecision as last step 2023-03-24 22:42:50 +08:00
Nelson Chan
bc87abf5c2 Fix: Clear uptime cache on push beat 2023-03-03 05:57:36 +08:00
Ruben van Dijk
896e33815d Merge branch 'louislam:master' into fix-metrics-push 2023-02-23 14:11:39 +01:00
Nelson Chan
3439074835 Feat: Use message to improve errror status code 2023-02-09 17:42:02 +08:00
Joseph
2a6d98ff01 Feat: Expand and Simplify Badge Functionality (#2211) 
* [expanding badges] added new configs

* [expanding badges] recieve ping in getPreviousHeartbeat()

* [expanding badges] re-added original new badges

* [expanding badges] recreate parity between old and new badges

* [expanding badges] fix linting
 2023-02-03 12:33:48 +08:00
Nelson Chan
348d0170fa Chore: Use constants instead of int 2023-02-01 05:33:36 +08:00
Ruben
71f00b3690 Parse push ping parameter with parseInt. 2023-01-12 18:33:39 +01:00
Nelson Chan
0ed3dd5e4f Fix: Add support for pending in badges 2023-01-12 04:14:46 +08:00
Nelson Chan
21b418230c Chore: reorder cases 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2023-01-10 19:25:31 +08:00
Sjouke de Vries
94b69935fe chore(server): remove comments from status-page router 2023-01-09 11:16:47 +01:00
Sjouke de Vries
3f30feaefb feat(server): add badge for overall status of status-page 2023-01-09 11:04:32 +01:00
Nelson Chan
dd82f36da3 Fix: Improve syntax & fix weird label logic 2023-01-09 00:16:18 +08:00
Nelson Chan
942b55ca03 Fix: Add support for maintenance in badges 2023-01-03 21:45:55 +08:00
Ruben
9404efd86d Fixed the metrics for the push type. 2022-12-28 10:37:25 +01:00
Louis Lam
90761cf831 Merge remote-tracking branch 'origin/master' into karelkryda_master 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/HeartbeatBar.vue
#	src/components/MonitorList.vue
#	src/icon.js
#	src/layouts/Layout.vue
#	src/mixins/datetime.js
#	src/mixins/socket.js
#	src/router.js
#	src/util.js
 2022-09-17 16:12:57 +08:00
Louis Lam
84fad93555 Merge pull request #1735 from woooferz/patch-1 
Added label to status badge
 2022-08-29 21:19:15 +08:00
Stefan Ottosson
f89ed0a3a4 feat: added HTTP method option for push monitor 2022-08-12 18:52:23 +02:00