Louis Lam
|
de6e1e7ddd
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# server/database.js
|
2 years ago |
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
|
2 years ago |
Louis Lam
|
d0d1e0de28
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# src/pages/EditMonitor.vue
|
2 years ago |
c0derMo
|
1062e629c5
|
Fix linting issues
|
2 years ago |
Moritz R
|
60e7824ff0
|
Merge branch 'master' into master
|
2 years ago |
c0derMo
|
fb3b407577
|
Added a settings page & localization
|
2 years ago |
Louis Lam
|
88afd662db
|
Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
# package-lock.json
# package.json
|
2 years ago |
c0derMo
|
0d098b0958
|
Docker Hosts are now a table & have their own dialog
|
2 years ago |
Louis Lam
|
c36d9a4b8b
|
Fix port data type #1802
|
2 years ago |
sur.la.route
|
4b2a465c94
|
Fix order of type and placeholder
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
Christopher Pickering
|
945288f0c0
|
Added postgres monitor
|
2 years ago |
OidaTiftla
|
ac27e6e2af
|
Rename feature to: Resend Notification if Down X times consequently
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
|
2 years ago |
OidaTiftla
|
869a040011
|
Merge branch 'master' into introduce-resend-interval
|
2 years ago |
Christopher Pickering
|
42848bcd2e
|
updated translations
|
2 years ago |
Louis Lam
|
a3b94aa532
|
Merge pull request #1550 from Computroniks/jsdoc-for-src
JSDoc for src/*/*
|
2 years ago |
Moritz R
|
ac449ec1c2
|
Merge branch 'master' into master
|
2 years ago |
Louis Lam
|
7d63b700e1
|
Merge pull request #1767 from christopherpickering/patch-2
[beta] workstation field should be text, not password
|
2 years ago |
Christopher Pickering
|
483cbfb636
|
added default value for sql server connection string
|
2 years ago |
sur.la.route
|
6995a29980
|
workstation field should be text, not password
|
2 years ago |
Louis Lam
|
d16be6fb7d
|
Fix and use null as authMethod None instead of empty string
|
2 years ago |
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
|
817f6db4fd
|
Remove SQL Server code (which in another pr already)
|
2 years ago |
Louis Lam
|
d4485fe62f
|
Make the monitor type list a bit clear
|
2 years ago |
Louis Lam
|
04e22f17a9
|
Merge remote-tracking branch 'origin/master' into christopherpickering_master
# Conflicts:
# package-lock.json
# src/languages/en.js
|
2 years ago |
Matthew Nickson
|
b0476cfb5b
|
Added JSDoc for src/pages/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
Moritz R
|
e9e78c26e5
|
Merge branch 'master' into master
|
2 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
|
2 years ago |
c0derMo
|
32cfd411f8
|
Fixed style & code errors
|
2 years ago |
Moritz R
|
a9f3142cee
|
Merge branch 'master' into master
|
2 years ago |
Sascha Kruse
|
019d638767
|
Merge remote-tracking branch 'ghupstream/master' into radius-check
|
2 years ago |
Louis Lam
|
7a50f0e3f3
|
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
Improve translation work
|
2 years ago |
Christopher Pickering
|
ef73af391f
|
added option for ntlm authorization
|
2 years ago |
Christopher Pickering
|
b7dc8e3ef8
|
started ui update
|
2 years ago |
Christopher Pickering
|
87f933df4f
|
added sqlserver monitor
|
2 years ago |
Sascha Kruse
|
398ecb7666
|
add radius check
|
2 years ago |
OidaTiftla
|
8e99cbf426
|
Merge branch 'master' into introduce-resend-interval
|
2 years ago |
Louis Lam
|
db50ba91cc
|
Fix #1593
|
2 years ago |
AnnAngela-work
|
45da7c5431
|
Improve translation work
|
2 years ago |
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
2 years ago |
Matthew Nickson
|
3c01e8732c
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2 years ago |
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
2 years ago |
Dick Tang
|
db3ef3805b
|
correct wordings for Certificate Expiry Notification (#1554)
|
2 years ago |
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2 years ago |
OidaTiftla
|
052fde5a24
|
Fix casing of text label
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
OidaTiftla
|
b7e2489d22
|
Merge branch 'master' into introduce-resend-interval
|
2 years ago |
Nelson Chan
|
cd38dd3f68
|
Feat: Allow MQTT successMessage to be optional
|
2 years ago |
Louis Lam
|
5fa62a888c
|
Merge branch 'master' into mqtt2
# Conflicts:
# server/database.js
# server/util-server.js
|
2 years ago |
Louis Lam
|
d71c086447
|
Standardize array bracket spacing
|
2 years ago |
Louis Lam
|
136fdf3768
|
MQTT password field to password type
|
2 years ago |
Louis Lam
|
566133e350
|
Domain Name Expiry Notification for https monitor only
|
2 years ago |