88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
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
25d711e683
Fix jsdoc data type
2 years ago
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
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
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
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
091158cfe7
[Status Page] Preload data
2 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2 years ago
ef73af391f
added option for ntlm authorization
2 years ago
44f6fca945
added finally to close connection pool
2 years ago
c346ea7864
updated name on export
2 years ago
f0ad32a252
merged
2 years ago
5720017fb4
updated name on import
2 years ago
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
87f933df4f
added sqlserver monitor
2 years ago
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
2 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2 years ago
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2 years ago
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2 years ago
1e595eaa76
Update linters
2 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2 years ago
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
2 years ago
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
2 years ago
d71c086447
Standardize array bracket spacing
2 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
2 years ago
566133e350
Domain Name Expiry Notification for https monitor only
2 years ago
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
2 years ago
083e8355b7
Change debug to log.debug
2 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
2 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>
2 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2 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>
2 years ago
649f3106e1
Enforce semicolon, fix format globally
2 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
2 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
2 years ago
Louis Lam
sur.la.route
Christopher Pickering
Matthew Nickson
Adam Stachowicz
Jens Neuber
Jens Neuber
Nelson Chan