c095767f4a
[Status Page] SSR
3 years ago
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
ea10d89f51
show correct down message for first tick
3 years ago
7f46223d68
Fix another log.debug call
3 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
ab4edf2092
Fix log.debug calls
3 years ago
5830f1e0b5
[feat] Adding PagerDuty notification
3 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
54184350a4
fix: missing semicolons
3 years ago
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
3 years ago
b7ba6330db
Feat: Add cert exp. settings
3 years ago
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
ef73af391f
added option for ntlm authorization
3 years ago
44f6fca945
added finally to close connection pool
3 years ago
c346ea7864
updated name on export
3 years ago
f0ad32a252
merged
3 years ago
5720017fb4
updated name on import
3 years ago
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
87f933df4f
added sqlserver monitor
3 years ago
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
59be9bb971
working
3 years ago
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
7da9f139c1
Bug fix
3 years ago
b680371746
Make apprise notification title configurable in UI
3 years ago
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
4b9dc2890d
Convert let to const
3 years ago
f9004bcbed
Add optional title to apprise notification
3 years ago
bc174c3325
Extract child process args into variable
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
53b98ad3e4
Add more comment for aliyun-sms fix
3 years ago
d0546afe71
fix esm require: no ugly warnings
3 years ago
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
369477b4b9
Update aliyun-sms.js
3 years ago
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
3 years ago
ae2c49a729
Update aliyun-sms.js
3 years ago
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
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
023db1450d
Fix #1577
3 years ago
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
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
1e595eaa76
Update linters
3 years ago
5fbfacf5ce
Fix ESlint warnings
3 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
03b2d8d521
Add JSDoc to server/*
...
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
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
3 years ago
200fdfb808
Merge code manually since some code moved to another file
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
17d4003e5c
Add dropdown menu
3 years ago
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
3 years ago
addf75daa7
Fix MQTT password do not save
3 years ago
359a490ae3
Fix #1510
3 years ago
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
07c474db0b
Merge remote-tracking branch 'origin/master'
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
083e8355b7
Change debug to log.debug
3 years ago
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
3 years ago
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
Louis Lam
Aram Akhavan
Marc Hagen
DasCanard
Philipp Dormann
Nelson Chan
Christopher Pickering
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
Greg Smith
GOGOsu
Matthew Nickson
Adam Stachowicz
Jens Neuber
Jens Neuber