9c7aa13190
fix: remove check that method is correct
6 months ago
1ac5696463
Merge branch 'master' into feature/http-method-push-monitor
...
# Conflicts:
# src/pages/EditMonitor.vue
6 months ago
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
12 months ago
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
12 months ago
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
1 year ago
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
1 year ago
38efd97b28
Fix: Support float ping in push route ( #3987 )
1 year ago
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
1 year ago
1b148786a5
Fix: Update `x-forwarded-host` field when using reverse proxy ( #3726 )
1 year ago
6875ecdfbf
Fix warnings ( #3826 )
1 year ago
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
1 year ago
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
1 year ago
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
1 year ago
3e5e7e6e32
Fix: Incorrect options for cert-exp badge
1 year ago
2e2747fb52
Handling DATE_ADD
1 year ago
32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push
...
Fixed the metrics for the push type.
2 years ago
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
2 years ago
4f05912276
Fix: Allow status badge with empty label
2 years ago
bf525371d9
Fix: Apply toPrecision as last step
2 years ago
bc87abf5c2
Fix: Clear uptime cache on push beat
2 years ago
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
2 years ago
3439074835
Feat: Use message to improve errror status code
2 years ago
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
2 years ago
348d0170fa
Chore: Use constants instead of int
2 years ago
71f00b3690
Parse push ping parameter with parseInt.
2 years ago
0ed3dd5e4f
Fix: Add support for pending in badges
2 years ago
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
dd82f36da3
Fix: Improve syntax & fix weird label logic
2 years ago
942b55ca03
Fix: Add support for maintenance in badges
2 years ago
9404efd86d
Fixed the metrics for the push type.
2 years ago
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
2 years ago
f89ed0a3a4
feat: added HTTP method option for push monitor
2 years ago
54548e34ed
Added label to status badge
3 years ago
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
091158cfe7
[Status Page] Preload data
3 years ago
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
42f931f6cf
Merge branch 'master' into master
3 years ago
2fe5c090aa
small fixes
3 years ago
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
4c2753af46
Remove an unused variable
3 years ago
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
3 years ago
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
7532acc95d
Resolve conflicts
3 years ago
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
60538036c6
[ #1108 ] Change "true" to "up"
3 years ago
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
3 years ago
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
3 years ago
Stefan Ottosson
Louis Lam
Nelson Chan
前端小武
Adam Stachowicz
Nelson Chan
Ruben van Dijk
Joseph
Ruben
Wooferz
Karel Krýda
Karel Krýda
Aram Akhavan