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
fe40d819bd
Update send403 to sendHttpError
2023-07-08 21:34:58 +08:00
3dbd8277f0
Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge
...
# Conflicts:
# .gitignore
2023-07-08 21:28:57 +08:00
3e5e7e6e32
Fix: Incorrect options for cert-exp badge
2023-06-29 07:12:19 +08:00
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
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
2023-03-26 15:46:00 +08:00
4f05912276
Fix: Allow status badge with empty label
2023-03-25 02:44:15 +08:00
bf525371d9
Fix: Apply toPrecision as last step
2023-03-24 22:42:50 +08:00
bc87abf5c2
Fix: Clear uptime cache on push beat
2023-03-03 05:57:36 +08:00
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
2023-02-23 14:11:39 +01:00
3439074835
Feat: Use message to improve errror status code
2023-02-09 17:42:02 +08:00
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
348d0170fa
Chore: Use constants instead of int
2023-02-01 05:33:36 +08:00
71f00b3690
Parse push ping parameter with parseInt.
2023-01-12 18:33:39 +01:00
0ed3dd5e4f
Fix: Add support for pending in badges
2023-01-12 04:14:46 +08:00
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-01-10 19:25:31 +08:00
94b69935fe
chore(server): remove comments from status-page router
2023-01-09 11:16:47 +01:00
3f30feaefb
feat(server): add badge for overall status of status-page
2023-01-09 11:04:32 +01:00
dd82f36da3
Fix: Improve syntax & fix weird label logic
2023-01-09 00:16:18 +08:00
942b55ca03
Fix: Add support for maintenance in badges
2023-01-03 21:45:55 +08:00
9404efd86d
Fixed the metrics for the push type.
2022-12-28 10:37:25 +01:00
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
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2022-08-29 21:19:15 +08:00
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2022-07-04 21:58:27 +08:00
54548e34ed
Added label to status badge
2022-06-08 20:05:10 +10:00
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
2022-06-06 22:40:26 +08:00
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:19 +02:00
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
42f931f6cf
Merge branch 'master' into master
2022-05-09 10:28:14 +02:00
2fe5c090aa
small fixes
2022-05-08 20:50:08 +02:00
cd3fbc80b4
Add first parameter back to logging in api router
2022-05-06 16:05:24 -07:00
4c2753af46
Remove an unused variable
2022-05-02 13:36:35 +08:00
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
2022-05-02 13:32:19 +08:00
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2022-05-01 17:03:11 +08:00
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
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
2022-04-30 13:40:34 +02:00
60538036c6
[ #1108 ] Change "true" to "up"
2022-04-28 23:44:08 +08:00
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
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
2022-04-26 13:48:44 -07:00
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 16:43:24 +01:00
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
2022-04-20 10:10:14 +02:00
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
2022-04-19 16:43:13 +08:00
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
2022-04-19 15:38:59 +08:00
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
94770cf865
Resolve log message null reference
2022-04-12 16:57:22 +08:00
Louis Lam
Nelson Chan
Ruben van Dijk
Joseph
Ruben
Sjouke de Vries
Wooferz
Karel Krýda
Karel Krýda
Aram Akhavan
Matthew Nickson
Jens Neuber