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
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
94770cf865
Resolve log message null reference
3 years ago
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
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
50d6e888c2
[new status page] wip
3 years ago
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
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
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
f00ec4dfef
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
43f8fc701c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
499042504f
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
faf6719e7c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
a9d264ccfc
PR feedback: remove spaces in comments
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
df8f93f0c2
clean uptime percentage display
3 years ago
6acc9546a0
PR feedback + remove redundant code + add a test
3 years ago
f455e3a454
add shields.io 'style' parameter
3 years ago
7abbf421d0
PR feedback
3 years ago
3625915a85
add ping, status badge
3 years ago
d74404e106
minor fixes
3 years ago
1c5bce8afa
a little documentation
3 years ago
35360e2069
add badges
3 years ago
3d002b3ce9
add status boolean parameter to push monitor
3 years ago
38f8a8ac2f
Merge branch 'louislam:master' into logging
3 years ago
d4bfe57b79
minor: improve formatting
3 years ago
dcc91d6c72
Fix #922
3 years ago
e5913c5abc
separate log functions
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
3 years ago
74688e69aa
Remove debug statement in server/routers/api-router.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
b32bfb3ff1
Added toggle for tag visibility
3 years ago
348c5ec995
Match lint settings
3 years ago
5e6d945095
Most hacked in POC
3 years ago
3b74b727f2
[Push Type] fix missing important flag and missing up notification
3 years ago
5ff9a64e5e
[Push Type] Fix missing duration calculation ( #685 )
3 years ago
7fa1cb83af
[push type] add ping parameter
3 years ago
8d5eaaf8a7
minor
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
f6a984b671
start-server-dev. Fixes #460
3 years ago
fe0fc63843
[status page] send uptime
3 years ago
8c7ee94769
add modified apicache library with disabling client cache
3 years ago
5f6aa32844
fix store/fetch status page config
3 years ago
7ee98d989c
[status page] implement rest api for heartbeat
3 years ago
fd95d41d9f
[status page] many update and save group list
3 years ago
2955abb5d9
[status page] create incident
3 years ago
512ff09cca
set entry page
3 years ago
e8f4fabcd0
[status page] crop and resize logo
3 years ago
db05b506f3
[status page] checkpoint
3 years ago
afe91078c4
[status page] checkpoint
3 years ago
f9311e4e7f
[status page]
3 years ago
Karel Krýda
Louis Lam
Aram Akhavan
Matthew Nickson
Jens Neuber
Jens Neuber
Jakub Blažej
Andreas Brett
Andreas Brett
Jasper Miller-Waugh
Adam Stachowicz