Louis Lam
|
7f46223d68
|
Fix another log.debug call
|
2022-05-28 23:22:44 +08:00 |
|
Louis Lam
|
df4ce811d9
|
Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
# server/model/monitor.js
|
2022-05-28 23:19:58 +08:00 |
|
Moritz R
|
e9e78c26e5
|
Merge branch 'master' into master
|
2022-05-27 13:59:58 +02:00 |
|
Aram Akhavan
|
ab4edf2092
|
Fix log.debug calls
|
2022-05-26 21:45:56 -07: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 |
|
c0derMo
|
32cfd411f8
|
Fixed style & code errors
|
2022-05-19 12:35:55 +00:00 |
|
Moritz R
|
a9f3142cee
|
Merge branch 'master' into master
|
2022-05-19 14:24:02 +02:00 |
|
Nelson Chan
|
b7ba6330db
|
Feat: Add cert exp. settings
|
2022-05-19 16:49:34 +08:00 |
|
Sascha Kruse
|
da99a57560
|
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
|
2022-05-18 15:56:21 +02:00 |
|
Sascha Kruse
|
42d68edab0
|
(style) add trailing comma
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-05-18 15:55:36 +02:00 |
|
Sascha Kruse
|
019d638767
|
Merge remote-tracking branch 'ghupstream/master' into radius-check
|
2022-05-18 15:54:10 +02:00 |
|
Louis Lam
|
7a46b44d25
|
Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
# src/components/HeartbeatBar.vue
|
2022-05-18 19:49:54 +08:00 |
|
Christopher Pickering
|
ef73af391f
|
added option for ntlm authorization
|
2022-05-13 12:58:23 -05:00 |
|
Christopher Pickering
|
c346ea7864
|
updated name on export
|
2022-05-13 08:57:06 -05:00 |
|
sur.la.route
|
e198f2f1ab
|
updated format
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-05-12 19:54:02 -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
|
59be9bb971
|
working
|
2022-05-11 00:51:11 +08:00 |
|
Karel Krýda
|
7da9f139c1
|
Bug fix
|
2022-05-09 21:10:12 +02:00 |
|
Aram Akhavan
|
bb7d67f717
|
Apply suggestions from code review
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-05-06 09:58:05 -07:00 |
|
Karel Krýda
|
9a35386841
|
Merge branch 'master' into master
|
2022-05-06 11:24:21 +02:00 |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
2022-05-06 14:41:34 +08:00 |
|
OidaTiftla
|
98ee9caf2c
|
Add variable for currentTime
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-05-05 15:55:33 +02:00 |
|
OidaTiftla
|
8e99cbf426
|
Merge branch 'master' into introduce-resend-interval
|
2022-05-04 22:58:40 +02:00 |
|
Greg Smith
|
cbfecab850
|
switch to the more-up-to-date esm-wallaby
https://github.com/wallabyjs/esm
|
2022-05-04 15:45:18 +09:30 |
|
Greg Smith
|
d0546afe71
|
fix esm require: no ugly warnings
|
2022-05-01 10:22:16 +09:30 |
|
Karel Krýda
|
b4ffcc5555
|
Added JSDoc
|
2022-04-30 15:50:05 +02:00 |
|
Karel Krýda
|
f78d01d770
|
Resolve lint errors
|
2022-04-30 14:57:08 +02:00 |
|
Greg Smith
|
f4515ad8c5
|
add axios cached dns resolve to monitor
|
2022-04-30 21:40:47 +09:30 |
|
Karel Krýda
|
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
|
2022-04-30 13:40:34 +02: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 |
|
Aram Akhavan
|
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
|
2022-04-26 13:48:44 -07:00 |
|
Adam Stachowicz
|
5fbfacf5ce
|
Fix ESlint warnings
|
2022-04-26 00:26:26 +02:00 |
|
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-24 01:06:45 +01:00 |
|
Matthew Nickson
|
46da5e51be
|
Fix JSDoc grammar
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-22 19:10:13 +01:00 |
|
Matthew Nickson
|
1eecdec2d9
|
Update JSDoc for better clarity
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-22 18:42:47 +01:00 |
|
Matthew Nickson
|
09e61d9d63
|
Changed Array<T> to type[]
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 20:02:18 +01:00 |
|
Matthew Nickson
|
0083485d4c
|
Updated server/model/* JSDoc to match new methods
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 18:30:04 +01:00 |
|
OidaTiftla
|
7ed8ae9f7c
|
Fix trailing space warning
|
2022-04-21 18:23:32 +02:00 |
|
OidaTiftla
|
d6b591a513
|
Make comment more readable
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 17:45:58 +02:00 |
|
Matthew Nickson
|
6d22ebedca
|
Merge branch 'master' into add-JSDoc-comments
|
2022-04-21 13:01:22 +01:00 |
|
OidaTiftla
|
60f8ab7285
|
Use new logging mechanism
|
2022-04-21 12:09:59 +02:00 |
|
OidaTiftla
|
b7e2489d22
|
Merge branch 'master' into introduce-resend-interval
|
2022-04-21 11:58:04 +02:00 |
|
Louis Lam
|
359a490ae3
|
Fix #1510
|
2022-04-18 15:21:58 +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
|
e6a8a84278
|
Include only nessacary data in webhook
|
2022-04-17 19:30:58 +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
|
8eb83394f7
|
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
|
2022-04-17 14:53:13 +08:00 |
|