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
|
2 years ago |
Wooferz
|
54548e34ed
|
Added label to status badge
|
2 years ago |
|
Louis Lam
|
4fdaa1abb6
|
[Push API] Response 404 if error, fix #1721
|
2 years ago |
|
Louis Lam
|
091158cfe7
|
[Status Page] Preload data
|
2 years ago |
Karel Krýda
|
6d0683b055
|
Update server/routers/api-router.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
|
Louis Lam
|
df4ce811d9
|
Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
# server/model/monitor.js
|
2 years ago |
|
Karel Krýda
|
42f931f6cf
|
Merge branch 'master' into master
|
3 years ago |
Karel Krýda
|
2fe5c090aa
|
small fixes
|
3 years ago |
Aram Akhavan
|
cd3fbc80b4
|
Add first parameter back to logging in api router
|
3 years ago |
|
Louis Lam
|
4c2753af46
|
Remove an unused variable
|
3 years ago |
|
Louis Lam
|
c6ba5b621c
|
Remove isPublished, checkPublished which had been removed in upstream.
|
3 years ago |
|
Louis Lam
|
d962ab7a1c
|
Merge branch 'master' into uptime-badges
# Conflicts:
# package-lock.json
# server/routers/api-router.js
|
3 years ago |
|
Karel Krýda
|
31b90d12a4
|
Added the ability to choose on which status pages maintenance information should be displayed
|
3 years ago |
|
Karel Krýda
|
b4ffcc5555
|
Added JSDoc
|
3 years ago |
|
Karel Krýda
|
7532acc95d
|
Resolve conflicts
|
3 years ago |
|
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
|
3 years ago |
|
Louis Lam
|
60538036c6
|
[#1108] Change "true" to "up"
|
3 years ago |
|
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
3 years ago |
|
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
|
3 years ago |
Matthew Nickson
|
3d04befc1f
|
Add JSDoc to server/routers/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
Jens Neuber
|
e103ac8335
|
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
|
3 years ago |
|
Louis Lam
|
29d2d95c71
|
Merge branch '1.14.X'
# Conflicts:
# package.json
# server/server.js
|
3 years ago |
|
Louis Lam
|
919393cac9
|
Partially change the server core into a class, remove all require("./server") #1520
|
3 years ago |
|
Louis Lam
|
8d8c38b1a8
|
Allow unused vars in args and fix more eslint issues
|
3 years ago |
|
Louis Lam
|
e9ce1433cd
|
Change log_info to log.info by making it into an object
|
3 years ago |
|
Louis Lam
|
94770cf865
|
Resolve log message null reference
|
3 years ago |
|
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
|
3 years ago |
|
Louis Lam
|
c4e74c9943
|
Render <StatusPage> if domain matched
|
3 years ago |
|
Louis Lam
|
aef0a66205
|
[Status Page] Simplify show tags logic
|
3 years ago |
|
Louis Lam
|
1033ca5cf4
|
[Status Page] wip, combine api, add status_page_id into group and incident tables
|
3 years ago |
|
Louis Lam
|
18ec42b060
|
[Status Page] wip
|
3 years ago |
|
Louis Lam
|
50d6e888c2
|
[new status page] wip
|
3 years ago |
|
Karel Krýda
|
b49e5d5c39
|
The SQL query to determine if the monitor is under maintenance is now in its own method.
|
3 years ago |
|
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
|
3 years ago |
|
Karel Krýda
|
5fda1f0f59
|
minor fixes (missing commas, spaces, translations)
|
3 years ago |
|
Karel Krýda
|
0d3414c6d6
|
A complete maintenance planning system has been created
|
3 years ago |
Jens Neuber
|
f00ec4dfef
|
PR feedback: remove spaces in parenthesis
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Jens Neuber
|
43f8fc701c
|
PR feedback: remove spaces in parenthesis
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Jens Neuber
|
499042504f
|
PR feedback: remove spaces in parenthesis
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Jens Neuber
|
faf6719e7c
|
PR feedback: remove spaces in parenthesis
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Jens Neuber
|
a9d264ccfc
|
PR feedback: remove spaces in comments
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Jens Neuber
|
df8f93f0c2
|
clean uptime percentage display
|
3 years ago |
|
Jens Neuber
|
6acc9546a0
|
PR feedback + remove redundant code + add a test
|
3 years ago |
|
Jens Neuber
|
f455e3a454
|
add shields.io 'style' parameter
|
3 years ago |
|
Jens Neuber
|
7abbf421d0
|
PR feedback
|
3 years ago |
|
Jens Neuber
|
3625915a85
|
add ping, status badge
|
3 years ago |
|
Jens Neuber
|
d74404e106
|
minor fixes
|
3 years ago |
|
Jens Neuber
|
1c5bce8afa
|
a little documentation
|
3 years ago |
|
Jens Neuber
|
35360e2069
|
add badges
|
3 years ago |
Jakub Blažej
|
3d002b3ce9
|
add status boolean parameter to push monitor
|
3 years ago |
