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