mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-27 14:39:51 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4047 commits 31 branches 117 tags 70 MiB
Commit graph

89 commits

Author SHA1 Message Date
Nelson Chan bc87abf5c2 Fix: Clear uptime cache on push beat 2023-03-03 05:57:36 +08: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
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
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
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
Louis Lam 27dbc021b4 Add standalone manifest.json for each status page. Close #1668 2022-07-04 21:58:27 +08:00
Wooferz 54548e34ed
Added label to status badge 2022-06-08 20:05:10 +10:00
Louis Lam 4fdaa1abb6 [Push API] Response 404 if error, fix #1721 2022-06-06 22:40:26 +08:00
Louis Lam 091158cfe7 [Status Page] Preload data 2022-06-01 13:05:12 +08:00
Karel Krýda 6d0683b055
Update server/routers/api-router.js 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-05-30 15:32:19 +02:00
Louis Lam c095767f4a [Status Page] SSR 2022-05-30 15:45:44 +08:00
Louis Lam df4ce811d9 Merge remote-tracking branch 'origin/master' into kaysond_master 
# Conflicts:
#	server/model/monitor.js
 2022-05-28 23:19:58 +08:00
Karel Krýda 42f931f6cf
Merge branch 'master' into master 2022-05-09 10:28:14 +02:00
Karel Krýda 2fe5c090aa small fixes 2022-05-08 20:50:08 +02:00
Aram Akhavan cd3fbc80b4
Add first parameter back to logging in api router 2022-05-06 16:05:24 -07:00
Louis Lam 4c2753af46 Remove an unused variable 2022-05-02 13:36:35 +08:00
Louis Lam c6ba5b621c Remove isPublished, checkPublished which had been removed in upstream. 2022-05-02 13:32:19 +08:00
Louis Lam d962ab7a1c Merge branch 'master' into uptime-badges 
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
 2022-05-01 17:03:11 +08:00
Karel Krýda 31b90d12a4 Added the ability to choose on which status pages maintenance information should be displayed 2022-04-30 17:17:22 +02:00
Karel Krýda b4ffcc5555 Added JSDoc 2022-04-30 15:50:05 +02:00
Karel Krýda 7532acc95d Resolve conflicts 2022-04-30 14:33:54 +02:00
Karel Krýda 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
Louis Lam 60538036c6 [#1108] Change "true" to "up" 2022-04-28 23:44:08 +08:00
Louis Lam 0ba5d031d0 Merge branch 'master' into push-status-param 
# Conflicts:
#	server/routers/api-router.js
 2022-04-28 23:34:51 +08:00
Aram Akhavan 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
Matthew Nickson 3d04befc1f
Add JSDoc to server/routers/* 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-21 16:43:24 +01:00
Jens Neuber e103ac8335 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-04-20 10:10:14 +02:00
Louis Lam 29d2d95c71 Merge branch '1.14.X' 
# Conflicts:
#	package.json
#	server/server.js
 2022-04-19 16:43:13 +08:00
Louis Lam 919393cac9 Partially change the server core into a class, remove all require("./server") #1520 2022-04-19 15:38:59 +08:00
Louis Lam 8d8c38b1a8 Allow unused vars in args and fix more eslint issues 2022-04-17 01:39:49 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
Louis Lam 94770cf865 Resolve log message null reference 2022-04-12 16:57:22 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging 
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
 2022-04-12 16:32:14 +08:00
Louis Lam c4e74c9943 Render <StatusPage> if domain matched 2022-04-06 22:43:22 +08:00
Louis Lam aef0a66205 [Status Page] Simplify show tags logic 2022-03-18 17:56:46 +08:00
Louis Lam 1033ca5cf4 [Status Page] wip, combine api, add status_page_id into group and incident tables 2022-03-16 15:38:10 +08:00
Louis Lam 18ec42b060 [Status Page] wip 2022-03-16 14:14:47 +08:00
Louis Lam 50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Karel Krýda b49e5d5c39 The SQL query to determine if the monitor is under maintenance is now in its own method. 2022-01-25 19:07:27 +01:00
Karel Krýda e7b2832967 The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones 2022-01-24 22:33:15 +01:00
Karel Krýda 5fda1f0f59 minor fixes (missing commas, spaces, translations) 2022-01-23 20:33:39 +01:00
Karel Krýda 0d3414c6d6 A complete maintenance planning system has been created 2022-01-23 15:22:00 +01:00
Jens Neuber f00ec4dfef
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:29 +01:00
Jens Neuber 43f8fc701c
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:23 +01:00
Jens Neuber 499042504f
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:07 +01:00