Moritz R
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
Louis Lam
7d63b700e1
Merge pull request #1767 from christopherpickering/patch-2
...
[beta] workstation field should be text, not password
2022-06-15 15:31:24 +08:00
Christopher Pickering
483cbfb636
added default value for sql server connection string
2022-06-14 09:00:23 -05:00
sur.la.route
6995a29980
workstation field should be text, not password
2022-06-14 07:45:04 -05:00
Louis Lam
d16be6fb7d
Fix and use null as authMethod None instead of empty string
2022-06-14 10:49:30 +08: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
817f6db4fd
Remove SQL Server code (which in another pr already)
2022-06-14 10:32:38 +08:00
Louis Lam
d4485fe62f
Make the monitor type list a bit clear
2022-06-13 18:14:47 +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
Matthew Nickson
b0476cfb5b
Added JSDoc for src/pages/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 13:46:44 +01:00
Moritz R
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02: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
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
Louis Lam
7a50f0e3f3
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
...
Improve translation work
2022-05-17 00:03:25 +08:00
Christopher Pickering
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
Christopher Pickering
b7dc8e3ef8
started ui update
2022-05-13 07:22:52 -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
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
Louis Lam
db50ba91cc
Fix #1593
2022-04-30 21:44:03 +08:00
AnnAngela-work
45da7c5431
Improve translation work
2022-04-29 20:17:15 +08:00
Louis Lam
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
Adam Stachowicz
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
Dick Tang
db3ef3805b
correct wordings for Certificate Expiry Notification ( #1554 )
2022-04-25 08:25:06 +08:00
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
OidaTiftla
052fde5a24
Fix casing of text label
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:56:38 +02:00
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2022-04-18 13:04:55 +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
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
Louis Lam
136fdf3768
MQTT password field to password type
2022-04-17 01:07:36 +08:00
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
2022-04-16 15:01:53 +08:00
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
2022-04-16 13:28:39 +08:00
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
Matthew Nickson
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
Louis Lam
fcb577097b
[Proxy] Change to radio button
2022-04-07 15:26:00 +08:00
Louis Lam
e89356b283
Show proxy option for http monitor only
2022-04-07 14:37:33 +08:00
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02:00
Uğur Erkan
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
2022-03-06 19:34:51 +03:00
Uğur Erkan
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
2022-03-06 19:34:49 +03:00
OidaTiftla
855b12f435
Add text for resend disabled
2022-01-24 22:20:38 +01:00
OidaTiftla
30ce53f57c
Fix min value of resend interval
2022-01-24 09:18:38 +01:00
OidaTiftla
11e9eee09d
Change seconds to minutes
2022-01-23 17:48:09 +01:00
OidaTiftla
1ac904d6d6
Introduce resend interval if down
2022-01-23 15:22:57 +01:00
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
2022-01-22 01:57:37 +00:00
Hans Mayer
c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages
2022-01-14 19:06:21 +01:00
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
c0derMo
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2022-01-13 11:53:08 +08:00
Louis Lam
1c8407a433
[MQTT] Use existing fields instead of creating new ones (UI)
2022-01-13 11:36:55 +08:00
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
Jakub Blažej
3d002b3ce9
add status boolean parameter to push monitor
2021-12-25 20:25:21 +01:00
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
2021-12-18 16:35:18 -05:00
Ivan Bratović
475a466c7e
Add attribute to basicauth-pass to prevent browsers from autocompleting ( #1063 )
2021-12-15 18:18:30 +08:00
Tarun Singh
5afc6a41e3
removed https requirement for url
2021-12-06 11:28:23 -05:00
Ivan Bratović
c1b118a0f6
Use existing Example translation for HTTP headers and body placeholders
2021-11-29 12:49:08 +01:00
Ivan Bratović
9c5466890e
Revert "Replace body and header placeholder functions with translations"
...
This reverts commit 2c85491ee0
2021-11-29 12:40:53 +01:00
Ivan Bratović
2ca7a5b962
Merge branch 'master' into improve-translatables
2021-11-24 10:03:30 +01:00
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
Louis
4155f84eec
improve basic auth style
2021-11-23 19:20:55 +08:00
Nelson Chan
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
2021-11-17 10:45:19 +08:00
Tarun Singh
3f5133d1ba
Added authentication logic
2021-11-16 20:44:10 -05:00
Ivan
567ea346fe
Add missing translations for placeholders in EditMonitor page
2021-11-12 15:30:31 +01:00
Ivan
265cca9ed1
Replace "Default" notification badge with translation
2021-11-11 10:54:09 +01:00
Ivan
2c85491ee0
Replace body and header placeholder functions with translations
2021-11-11 10:52:22 +01:00
Tarun Singh
3721d11259
changed table column names for more specifity
2021-11-09 18:53:00 -05:00
Tarun Singh
149015556b
server url changes
2021-11-04 22:25:29 -04:00
Tarun Singh
2bcbeba384
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:23:02 -04:00
Ivan Bratović
0481a241f3
Add translated placeholders for editing basic auth
2021-11-04 10:22:42 +01:00
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
Ivan Bratović
0dcb7aed21
Delinting
2021-11-04 09:50:10 +01:00
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
Tarun Singh
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
Louis Lam
c9549c0de2
change body and header placeholders, less misleading.
2021-10-23 22:14:05 +08:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
Louis Lam
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n
...
Missing i18n and zh-CN translation
2021-10-16 22:47:58 +08:00
Bert Verhelst
61627545a5
fix(edit-monitor): no need to escape placeholder {} if not translated
2021-10-16 11:26:32 +02:00
NeuralMiner
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
Louis Lam
f4b8da0a5c
Merge branch 'feature/add-support-for-method-body-and-headers'
2021-10-15 19:02:49 +08:00
Louis Lam
4178983df3
Merge remote-tracking branch 'origin/master'
2021-10-15 19:01:04 +08:00
Louis Lam
7ac0ab2e34
[http options] beautify the json format when clicked the save button
2021-10-15 18:57:27 +08:00
Louis Lam
cd211a6be7
[http options] fine tune
2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
2021-10-15 00:54:31 +08:00
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
2021-10-14 22:32:15 +08:00
Louis Lam
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
2021-10-14 16:07:25 +08:00
zsxeee
33f773fcd0
Move param out of the translation file
2021-10-13 15:36:07 +08:00
zsxeee
3fe91c52cb
Fix i18n
...
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
2021-10-12 16:29:18 +08:00
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
2021-10-09 12:42:32 +02:00
Bert Verhelst
b8093e909b
fix(edit-monitor): fix minification of translations containing { }
2021-10-09 11:38:12 +02:00
Bert Verhelst
c3c273f9df
fix(edit-monitor): fix regex to allow a single header
2021-10-09 11:20:33 +02:00
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
