98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
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
6424fe77ab
Change successful log from info to debug in order to avoid large log and less disk usage
2022-06-13 21:15:47 +08:00
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:53:19 +08:00
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:50:43 +08:00
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 >
2022-06-11 17:23:12 +01:00
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
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2022-06-09 19:33:10 +08:00
2c0180f323
Fix: Fix error when status page desc. is null
2022-06-07 14:57:23 +08:00
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
a674caa520
[Status Page] Add og meta tags
2022-05-31 22:53:48 +08:00
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com >
2022-05-30 15:31:45 +02:00
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2022-05-30 14:00:39 +08:00
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
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
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-05-18 15:55:36 +02:00
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08:00
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-05-12 19:54:02 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
59be9bb971
working
2022-05-11 00:51:11 +08:00
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-05-06 09:58:05 -07:00
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02:00
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-05-05 15:55:33 +02:00
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
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
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
Christopher Pickering