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
|
2 years ago |
|
Louis Lam
|
6424fe77ab
|
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
|
2 years ago |
|
Louis Lam
|
6e43ef1dd3
|
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
|
2 years ago |
|
Louis Lam
|
a28ef56553
|
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
# Conflicts:
# package-lock.json
# package.json
|
2 years ago |
|
Louis Lam
|
f570d41142
|
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
# Conflicts:
# package-lock.json
# package.json
|
2 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
|
11243a6ca1
|
Merge pull request #1222 from NETivism/issue-1201
Show some pure text body in notification when keyword not found
|
3 years ago |
Nelson Chan
|
2c0180f323
|
Fix: Fix error when status page desc. is null
|
3 years ago |
|
Louis Lam
|
091158cfe7
|
[Status Page] Preload data
|
3 years ago |
|
Louis Lam
|
a674caa520
|
[Status Page] Add og meta tags
|
3 years ago |
|
Louis Lam
|
c095767f4a
|
[Status Page] SSR
|
3 years ago |
|
Louis Lam
|
ffb7ba176c
|
Merge remote-tracking branch 'origin/master' into status-page-inject-html
|
3 years ago |
Aram Akhavan
|
ea10d89f51
|
show correct down message for first tick
|
3 years ago |
|
Louis Lam
|
7f46223d68
|
Fix another log.debug call
|
3 years ago |
|
Louis Lam
|
df4ce811d9
|
Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
# server/model/monitor.js
|
3 years ago |
|
Aram Akhavan
|
ab4edf2092
|
Fix log.debug calls
|
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 |
|
Nelson Chan
|
b7ba6330db
|
Feat: Add cert exp. settings
|
3 years ago |
Christopher Pickering
|
ef73af391f
|
added option for ntlm authorization
|
3 years ago |
|
Christopher Pickering
|
c346ea7864
|
updated name on export
|
3 years ago |
|
sur.la.route
|
e198f2f1ab
|
updated format
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
Christopher Pickering
|
87f933df4f
|
added sqlserver monitor
|
3 years ago |
|
Louis Lam
|
59be9bb971
|
working
|
3 years ago |
Karel Krýda
|
7da9f139c1
|
Bug fix
|
3 years ago |
|
Aram Akhavan
|
bb7d67f717
|
Apply suggestions from code review
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
3 years ago |
Greg Smith
|
cbfecab850
|
switch to the more-up-to-date esm-wallaby
https://github.com/wallabyjs/esm
|
3 years ago |
|
Greg Smith
|
d0546afe71
|
fix esm require: no ugly warnings
|
3 years ago |
|
Greg Smith
|
f4515ad8c5
|
add axios cached dns resolve to monitor
|
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 |
|
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
|
3 years ago |
Adam Stachowicz
|
5fbfacf5ce
|
Fix ESlint warnings
|
3 years ago |
|
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
3 years ago |
|
Matthew Nickson
|
46da5e51be
|
Fix JSDoc grammar
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
1eecdec2d9
|
Update JSDoc for better clarity
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.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
|
0083485d4c
|
Updated server/model/* JSDoc to match new methods
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
3 years ago |
|
Matthew Nickson
|
6d22ebedca
|
Merge branch 'master' into add-JSDoc-comments
|
3 years ago |
|
Louis Lam
|
359a490ae3
|
Fix #1510
|
3 years ago |
|
Louis Lam
|
5fa62a888c
|
Merge branch 'master' into mqtt2
# Conflicts:
# server/database.js
# server/util-server.js
|
3 years ago |
|
Louis Lam
|
e6a8a84278
|
Include only nessacary data in webhook
|
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
|
8eb83394f7
|
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
|
3 years ago |
|
Matthew Nickson
|
45f44b183d
|
Add JSDoc to server/model/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
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
|
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 |
|
Matthew Nickson
|
8c8eeaf627
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
3 years ago |
