Louis Lam
|
1f5466a3e8
|
Revert #1598
|
2022-06-23 15:54:33 +08:00 |
|
Christopher Pickering
|
660005b143
|
cleaned up code
|
2022-06-14 08:49:36 -05:00 |
|
Christopher Pickering
|
98f3c126e5
|
passed lint
|
2022-06-14 07:58:35 -05:00 |
|
sur.la.route
|
cf2ca71dee
|
prevent null workstation #'s from passing..
to axios-ntlm
|
2022-06-14 07:42:53 -05:00 |
|
Aram Akhavan
|
c690d1c3a1
|
fix timeout bypass for upside down push monitor
|
2022-06-13 22:05:58 -07: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
|
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 |
|
Louis Lam
|
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 |
|
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
|
2022-06-13 18:53:19 +08:00 |
|
Louis Lam
|
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 |
|
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
|
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 |
|
Nelson Chan
|
2c0180f323
|
Fix: Fix error when status page desc. is null
|
2022-06-07 14:57:23 +08:00 |
|
Louis Lam
|
091158cfe7
|
[Status Page] Preload data
|
2022-06-01 13:05:12 +08:00 |
|
Louis Lam
|
a674caa520
|
[Status Page] Add og meta tags
|
2022-05-31 22:53:48 +08:00 |
|
Louis Lam
|
c095767f4a
|
[Status Page] SSR
|
2022-05-30 15:45:44 +08:00 |
|
Louis Lam
|
ffb7ba176c
|
Merge remote-tracking branch 'origin/master' into status-page-inject-html
|
2022-05-30 14:00:39 +08:00 |
|
Aram Akhavan
|
ea10d89f51
|
show correct down message for first tick
|
2022-05-28 19:57:45 -07:00 |
|
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 |
|
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 |
|
Nelson Chan
|
b7ba6330db
|
Feat: Add cert exp. settings
|
2022-05-19 16:49:34 +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 |
|
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 |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
2022-05-06 14:41:34 +08: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 |
|
Greg Smith
|
f4515ad8c5
|
add axios cached dns resolve to monitor
|
2022-04-30 21:40:47 +09:30 |
|
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 |
|
Matthew Nickson
|
6d22ebedca
|
Merge branch 'master' into add-JSDoc-comments
|
2022-04-21 13:01:22 +01: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 |
|