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
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
f4f2b8ddb8
Try to fix #1658
2022-06-13 19:24:05 +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
Louis Lam
6ee7b3696a
Merge pull request #1633 from domingospanta/bugfix/1451_blank_page_on_unkown_resource
...
Bugfix/1451 blank page on unkown resource
2022-06-06 21:54:49 +08:00
Louis Lam
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
Nelson Chan
26ff6f45a0
Feat: Use i18n pluralization
2022-05-30 17:53:32 +08:00
Louis Lam
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08: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
Domingos F. Panta Jr
73b965c867
Merge branch 'master' into bugfix/1451_blank_page_on_unkown_resource
2022-05-19 19:35:58 +01:00
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
Alexis Lefebvre
175556f9fc
s/cros/CORS
2022-05-16 20:30:16 +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
Domingos Panta
7cc89979f0
Moving change from axios interceptor to specific request.
2022-05-12 15:52:21 +01:00
Domingos Panta
fdd781b081
Added a link to the home page on the lists of actions.
...
s new link was necessary to prevent a loop when the user tries to access a unknown resource, like status/123, and was redirected to /page-not-found. In this case going back to the last page would be /status/123 which does not exists.
2022-05-11 17:58:52 +01:00
Louis Lam
5bf58cc6c4
Merge pull request #1595 from Saibamen/fix_eslint
...
Fix ESLint warnings and errors
2022-05-09 13:55:08 +08:00
Adam Stachowicz
069d3765f0
Revert change for StatusPage
2022-05-02 01:13:17 +02:00
Louis Lam
db50ba91cc
Fix #1593
2022-04-30 21:44:03 +08:00
Adam Stachowicz
c114c053d6
Fix ESLint warnings and errors
2022-04-30 03:51:14 +02: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
Louis Lam
07c0801ad5
Make logout button reactive, improve dropdown menu css
2022-04-20 22:39:07 +08:00
Louis Lam
bdc23a3f57
Merge pull request #1519 from AnnAngela/1.15.0_zh-cn
...
Update en&zh-CN lang file with 1 new i18n entry
2022-04-19 23:48:07 +08:00
AnnAngela-work
18925293fb
Update en&zh-CN lang file with 1 new i18n entry
2022-04-19 10:48:20 +08:00
Louis Lam
17d4003e5c
Add dropdown menu
2022-04-19 00:39:49 +08: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
572f2b9838
eslint
2022-04-17 14:57:31 +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
Louis Lam
1bc01d1077
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
2022-04-17 13:21:41 +08:00
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +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
Louis Lam
3436e26ed4
Fix styleline, fix css format issues globally
2022-04-14 01:20:54 +08:00
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
2022-04-14 01:20:54 +08:00
Louis Lam
81de2eedfb
Fix template can contain one tag only, disable vue/require-component-is eslint rule
2022-04-12 20:23:11 +08:00
