OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
Adam Stachowicz
069d3765f0
Revert change for StatusPage
2022-05-02 01:13:17 +02:00
Karel Krýda
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
Louis Lam
db50ba91cc
Fix #1593
2022-04-30 21:44:03 +08:00
Karel Krýda
57368c8c6c
More modern look of maintenance information on status page (same design as for the new incident system)
2022-04-30 15:32:56 +02:00
Karel Krýda
11ef22edec
Fixed remaining lint errors
2022-04-30 15:13:13 +02:00
Karel Krýda
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
Karel Krýda
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
Karel Krýda
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2022-04-30 13:40:34 +02: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
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
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
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02: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
Louis Lam
4a6d7207ef
Merge branch 'master' into customstatuspage
...
# Conflicts:
# src/languages/de-DE.js
# src/languages/en.js
# src/pages/StatusPage.vue
2022-04-12 19:39:42 +08:00
Louis Lam
f030487f7d
Fix theme color that do not apply to status page with a custom domain
2022-04-10 13:46:00 +08:00
Louis Lam
c9fa183712
Manage domain names
2022-04-10 00:25:27 +08:00
Louis Lam
0b9b5102ec
Minor
2022-04-09 17:23:22 +08:00
Louis Lam
c399984b7f
Improve status page sidebar
2022-04-09 17:03:10 +08:00
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
Louis Lam
2e50ef0e8f
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
...
1.14.0 translation improvement
2022-04-09 14:40:38 +08: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
c4e74c9943
Render <StatusPage> if domain matched
2022-04-06 22:43:22 +08:00
Louis Lam
355aec46dc
Merge branch 'master' into status-page-domain
2022-04-05 22:59:39 +08:00