742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2 years ago
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2 years ago
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
584d52517a
[Linter] fixing quotes with doublequote
2 years ago
82dd9a7c16
golaert req fix and axios update for formdata
2 years ago
d44663c57c
provider name fix
2 years ago
e557545c97
goalert needs post instead of get
2 years ago
40b9d9ed17
goalert provider missing semicolon fix for linter
2 years ago
65e6921a41
goalert notification provider added
2 years ago
3a90d246a4
fix: wrong type
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
34ab6142db
fix: remove new space line
2 years ago
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2 years ago
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2 years ago
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2 years ago
71d62ee151
removed ; after the PRAGMA command
2 years ago
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2 years ago
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2 years ago
2389b604fe
Use Settings.get
2 years ago
a3b1612938
getClientIP respect trustProxy setting
2 years ago
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
bea8679788
Merge branch 'master' into issue-1861
2 years ago
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2 years ago
8ced61697a
Fix save docker host issue
2 years ago
f3322398e5
Fix and improve test docker host
2 years ago
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
fb3b407577
Added a settings page & localization
2 years ago
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
e356d5f623
Fixing linting & adding documentation
2 years ago
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
239611a016
Do not set sendUrl if sendUrl is undefined
2 years ago
c4a2ce4e78
Add authentication support for ntfy
2 years ago
a382f811f4
added comment to startE2eTests function
2 years ago
986c03aecd
test cypress run
2 years ago
af07c7f050
feat(notification): add Authorization Header option to backend
2 years ago
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
17ed051401
Add CacheableDnsHttpAgent.install()
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2 years ago
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
25d711e683
Fix jsdoc data type
2 years ago
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2 years ago
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
f33b6de157
Support X-Forwarded-Host header
2 years ago
d29955f3ba
Merge pull request #1741 from Computroniks/feature/#1221-clickable-hostaname-on-status-page
...
Added #1221 clickable hostname in status page
2 years ago
c4125a8334
style: fix linter error
2 years ago
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
2 years ago
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
e5e8db6c38
Add cacheable-lookup
2 years ago
dddd2c0042
Cache settings, reduce the database / disk usage
2 years ago
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
2 years ago
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
f84ae82983
feat: added Home Assistant notification integration
2 years ago
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2 years ago
1f5466a3e8
Revert #1598
2 years ago
c36d9a4b8b
Fix port data type #1802
2 years ago
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2 years ago
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
edcdedcaae
Added check for blank password.
2 years ago
945288f0c0
Added postgres monitor
2 years ago
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
660005b143
cleaned up code
2 years ago
98f3c126e5
passed lint
2 years ago
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2 years ago
c690d1c3a1
fix timeout bypass for upside down push monitor
2 years ago
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2 years ago
54b9698a05
Update
3 years ago
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
3 years ago
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
3 years ago
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
3 years ago
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
3 years ago
1c4ddaeddf
Update
3 years ago
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
404923b7c8
bugfix
3 years ago
a41023ca2a
Update
3 years ago
817c941489
Add Bark Notification Parameters
3 years ago
5f6347d277
pull request for adding alertnow notification
3 years ago
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
aa398948da
Merge branch 'louislam:master' into patch-1
3 years ago
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
3 years ago
54548e34ed
Added label to status badge
3 years ago
2c0180f323
Fix: Fix error when status page desc. is null
3 years ago
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
3 years ago
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
3 years ago
091158cfe7
[Status Page] Preload data
3 years ago
e4ad8cbfc8
Remove unused variables
3 years ago
a674caa520
[Status Page] Add og meta tags
3 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
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
e9e78c26e5
Merge branch 'master' into master
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
32cfd411f8
Fixed style & code errors
3 years ago
a9f3142cee
Merge branch 'master' into master
3 years ago
b7ba6330db
Feat: Add cert exp. settings
3 years ago
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
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
398ecb7666
add radius check
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
42f931f6cf
Merge branch 'master' into master
3 years ago
2fe5c090aa
small fixes
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
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
93050208bb
Merge database changes into single patch file
3 years ago
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
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
2b14bdae62
Merge branch 'master' into master
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
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
b4ffcc5555
Added JSDoc
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
f78d01d770
Resolve lint errors
3 years ago
7532acc95d
Resolve conflicts
3 years ago
f4515ad8c5
add axios cached dns resolve to monitor
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
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
7ed8ae9f7c
Fix trailing space warning
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
d6b591a513
Make comment more readable
...
Co-authored-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
19933bbd99
Improve backwards compatibility
3 years ago
60f8ab7285
Use new logging mechanism
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
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
fb0064082e
Change Pushdeer to PushDeer
3 years ago
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
fb059f5e91
Add support for Pushdeer notifications
3 years ago
d0b5f147e2
Fix spelling and merge mistake
3 years ago
ddf8a7a692
Fix camelCase
3 years ago
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
4656ab3d57
Add OneBot notification service
3 years ago
0a5db0cecb
Fix #1478
3 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
649f3106e1
Enforce semicolon, fix format globally
3 years ago
Matthew Nickson
Louis Lam
Muhammed Hussein karimi
minhhn3
Minh Hoàng
Joseph Benguira
rmt/src
0x01code
Moritz R
c0derMo
Rolf Bachmann
tamasmagyar
Jan Hartje
Chongyi Zheng
theS1LV3R
sur.la.route
OidaTiftla
OidaTiftla
Aram Akhavan
Super Manito
Daeho Ro
Wooferz
Nelson Chan
Karel Krýda
Marc Hagen
DasCanard
Philipp Dormann
Sascha Kruse
Sascha Kruse
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
Greg Smith
GOGOsu
Adam Stachowicz
Jens Neuber
Jens Neuber
ngc7331
ColdThunder11
ColdThunder11