Louis Lam
|
b993859926
|
Drop Jest e2e testing (#2174)
|
2022-10-05 14:26:30 +08:00 |
|
Louis Lam
|
197d44981f
|
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
# package.json
|
2022-09-09 16:32:23 +08:00 |
|
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
|
2022-08-11 21:08:06 +08:00 |
|
Louis Lam
|
2389b604fe
|
Use Settings.get
|
2022-07-31 23:41:29 +08:00 |
|
Louis Lam
|
88afd662db
|
Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
# package-lock.json
# package.json
|
2022-07-24 14:07:30 +08:00 |
|
tamasmagyar
|
a382f811f4
|
added comment to startE2eTests function
|
2022-07-18 20:51:17 +02:00 |
|
tamasmagyar
|
986c03aecd
|
test cypress run
|
2022-07-18 20:51:17 +02:00 |
|
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(..).
|
2022-07-18 23:14:16 +08:00 |
|
Louis Lam
|
25d711e683
|
Fix jsdoc data type
|
2022-07-18 22:06:25 +08:00 |
|
Louis Lam
|
515095ecfb
|
Move all settings code from util-server.js into settings.js
|
2022-06-29 14:57:40 +08:00 |
|
sur.la.route
|
47e82ed83a
|
Removed blank line
Co-authored-by: Matthew Nickson <[email protected]>
|
2022-06-15 20:14:36 -05:00 |
|
sur.la.route
|
e1f766756f
|
Removed blank line
Co-authored-by: Matthew Nickson <[email protected]>
|
2022-06-15 20:14:26 -05:00 |
|
Christopher Pickering
|
edcdedcaae
|
Added check for blank password.
|
2022-06-15 13:00:14 -05:00 |
|
Christopher Pickering
|
945288f0c0
|
Added postgres monitor
|
2022-06-15 12:12:47 -05:00 |
|
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
|
2022-06-14 10:36:29 +08:00 |
|
Louis Lam
|
04e22f17a9
|
Merge remote-tracking branch 'origin/master' into christopherpickering_master
# Conflicts:
# package-lock.json
# src/languages/en.js
|
2022-06-11 20:59:58 +08:00 |
|
Louis Lam
|
091158cfe7
|
[Status Page] Preload data
|
2022-06-01 13:05:12 +08:00 |
|
Louis Lam
|
35b8e89457
|
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
Added #1059: Allow to specify Resolver Port for DNS Monitor
|
2022-05-25 14:59:14 +08:00 |
|
Christopher Pickering
|
ef73af391f
|
added option for ntlm authorization
|
2022-05-13 12:58:23 -05:00 |
|
Christopher Pickering
|
44f6fca945
|
added finally to close connection pool
|
2022-05-13 09:34:31 -05:00 |
|
Christopher Pickering
|
c346ea7864
|
updated name on export
|
2022-05-13 08:57:06 -05:00 |
|
Christopher Pickering
|
f0ad32a252
|
merged
|
2022-05-13 08:41:31 -05:00 |
|
Christopher Pickering
|
5720017fb4
|
updated name on import
|
2022-05-13 08:40:46 -05:00 |
|
sur.la.route
|
5bba19f866
|
updated format
Co-authored-by: Adam Stachowicz <[email protected]>
|
2022-05-12 19:54:12 -05:00 |
|
Christopher Pickering
|
87f933df4f
|
added sqlserver monitor
|
2022-05-12 12:48:03 -05:00 |
|
Sascha Kruse
|
398ecb7666
|
add radius check
|
2022-05-12 15:21:13 +02:00 |
|
Louis Lam
|
4e3258579d
|
Merge branch 'master' into uptime-badges
# Conflicts:
# server/util-server.js
|
2022-05-07 13:26:47 +08:00 |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
2022-05-06 14:41:34 +08:00 |
|
Louis Lam
|
d962ab7a1c
|
Merge branch 'master' into uptime-badges
# Conflicts:
# package-lock.json
# server/routers/api-router.js
|
2022-05-01 17:03:11 +08:00 |
|
Louis Lam
|
42ea3fb412
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <[email protected]>
|
2022-04-30 21:36:07 +08:00 |
|
Louis Lam
|
9f8b3151d8
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <[email protected]>
|
2022-04-30 21:36:00 +08:00 |
|
Matthew Nickson
|
3c01e8732c
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-27 18:26:11 +01:00 |
|
Louis Lam
|
1687de163c
|
Merge pull request #1565 from Saibamen/eslint
Fix some of ESLint warnings
|
2022-04-27 15:00:49 +08:00 |
|
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
2022-04-26 01:26:57 +02:00 |
|
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-24 01:06:45 +01:00 |
|
Jens Neuber
|
64a33d7455
|
Update server/util-server.js
Co-authored-by: Adam Stachowicz <[email protected]>
|
2022-04-22 07:54:13 +02:00 |
|
Matthew Nickson
|
09e61d9d63
|
Changed Array<T> to type[]
Signed-off-by: Matthew Nickson <[email protected]>
|
2022-04-21 20:02:18 +01:00 |
|
Matthew Nickson
|
c2f6c5b42e
|
Added JSDoc docs for mqttAsync
Signed-off-by: Matthew Nickson <[email protected]>
|
2022-04-21 18:53:07 +01:00 |
|
Matthew Nickson
|
6d22ebedca
|
Merge branch 'master' into add-JSDoc-comments
|
2022-04-21 13:01:22 +01:00 |
|
Matthew Nickson
|
03b2d8d521
|
Add JSDoc to server/*
Signed-off-by: Matthew Nickson <[email protected]>
|
2022-04-20 19:56:40 +01:00 |
|
Jens Neuber
|
e103ac8335
|
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
|
2022-04-20 10:10:14 +02:00 |
|
Nelson Chan
|
cd38dd3f68
|
Feat: Allow MQTT successMessage to be optional
|
2022-04-18 13:04:55 +08:00 |
|
Louis Lam
|
5fa62a888c
|
Merge branch 'master' into mqtt2
# Conflicts:
# server/database.js
# server/util-server.js
|
2022-04-17 19:46:33 +08:00 |
|
Louis Lam
|
47c72192e1
|
[eslint] Enable yoda and eqeqeq
|
2022-04-17 15:43:03 +08:00 |
|
Louis Lam
|
d71c086447
|
Standardize array bracket spacing
|
2022-04-17 15:27:35 +08:00 |
|
Louis Lam
|
8d8c38b1a8
|
Allow unused vars in args and fix more eslint issues
|
2022-04-17 01:39:49 +08:00 |
|
Louis Lam
|
e34420368b
|
Remove try-catch and fix username/password/port not working for mqtt
|
2022-04-17 01:06:47 +08:00 |
|
Louis Lam
|
566133e350
|
Domain Name Expiry Notification for https monitor only
|
2022-04-16 15:01:53 +08:00 |
|
Louis Lam
|
30e113755e
|
Add HIDE_LOG and catch error if cannot subscribe topic
|
2022-04-16 14:50:48 +08:00 |
|
Louis Lam
|
083e8355b7
|
Change debug to log.debug
|
2022-04-16 13:37:17 +08:00 |
|