Commit graph

1338 commits

Author SHA1 Message Date
Louis Lam 0ba5d031d0 Merge branch 'master' into push-status-param
# Conflicts:
#	server/routers/api-router.js
2022-04-28 23:34:51 +08:00
Louis Lam 66e4c89897
Merge pull request #1560 from MrEddX/bulgarian
Update bg-BG.js
2022-04-28 23:23:09 +08:00
Louis Lam d210548ae8
Merge pull request #1581 from NixNotCastey/update-pl
Update polish translation
2022-04-28 23:22:31 +08:00
Łukasz Szczepański 09fdef9bdc Update polish translation 2022-04-28 11:14:02 +02:00
Dmitry Yaskovich 7078b06272
Fix typo in Russian localization 2022-04-27 21:22:42 +03:00
Matthew Nickson 3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-27 18:26:11 +01:00
Phuong Nguyen Minh a3baa3c149
Update language vi.js (#1572)
Update vi-VN.js
2022-04-27 15:07:42 +08:00
Louis Lam 2adb142ae2
Merge pull request #1571 from MarkusDick/update-german-translations
lang: update german translations
2022-04-27 15:04:04 +08:00
MrEddX 372bf57e9f
Update bg-BG.js
Translation fixes
2022-04-27 09:19:13 +03:00
MrEddX 03e6f0a6c8
Update bg-BG.js
Translation fixes.
2022-04-26 21:39:14 +03:00
Markus Dick dcec53a755 lang: update german translations 2022-04-26 20:27:00 +02:00
Adam Stachowicz 1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
MrEddX 4c8da89c36
Update bg-BG.js
Translation fixes
2022-04-25 07:26:40 +03: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
MrEddX 4d4d04adbd
Update bg-BG.js
Some translation fixes
2022-04-20 22:01:57 +03:00
MrEddX f8c9472ea2
Update bg-BG.js
- Updated and fixed
2022-04-20 21:54:57 +03:00
Louis Lam 4e28ad4ac2
Merge pull request #1524 from chakflying/fix/disable-auth-icon
Fix: Handle disabled auth in user dropdown
2022-04-20 23:50:33 +08:00
Louis Lam 07c0801ad5 Make logout button reactive, improve dropdown menu css 2022-04-20 22:39:07 +08:00
SiderealArt 8cefc96c78
Update Traditional Chinese (Taiwan) translation 2022-04-20 18:11:26 +08:00
Nelson Chan a391576285 Chore: Add translation 2022-04-20 15:09:31 +08:00
Nelson Chan e0966e55c8 Fix: Handle disabled auth in user dropdown 2022-04-20 15:01:13 +08:00
Koen Habets 59d9891105
Update nl-NL.js 2022-04-19 21:17:33 +02: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
Louis Lam cd7c2beca6 Update CSS for dropdown menu 2022-04-19 19:46:21 +08:00
Louis Lam 8ee99760ec Minor lint 2022-04-19 19:41:52 +08:00
Louis Lam cb55e23718 Add $root.username 2022-04-19 19:40:28 +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
Louis Lam cefb5bb60a Merge branch 'master' into #1209-Logout-button-in-navbar 2022-04-18 20:39:24 +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 cd3dfd3146
Merge pull request #1083 from patrickhafner/customstatuspage
Custom status page
2022-04-17 15:04:02 +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 4e6ddc8880
Merge pull request #1497 from MrEddX/bulgarian
Bulgarian
2022-04-17 01:40:43 +08:00
Louis Lam 07c474db0b Merge remote-tracking branch 'origin/master' 2022-04-17 01:40:05 +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 30e113755e Add HIDE_LOG and catch error if cannot subscribe topic 2022-04-16 14:50:48 +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
Louis Lam b7aebceaab
Update bg-BG.js 2022-04-15 19:49:16 +08:00
MrEddX 0302fdbc96
Update bg-BG.js
Status pages - fix
2022-04-15 13:10:14 +03:00
MrEddX 84a50f058f
Update bg-BG.js 2022-04-15 13:06:22 +03:00
Nelson Chan 6f99d7577b Fix: Limit saved period & clear when set to recent 2022-04-15 03:24:58 +08:00
Nelson Chan 1417b6eacf Feat: Save and restore chart period 2022-04-15 02:56:21 +08:00
Louis Lam fb0064082e Change Pushdeer to PushDeer 2022-04-14 14:34:30 +08:00
ngc7331 93c51504f9 fixes: formatting and security issues
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 14:34:30 +08:00
ngc7331 fb059f5e91 Add support for Pushdeer notifications 2022-04-14 14:34:30 +08:00
PhyxionNL 2e3414135f Update src/components/PingChart.vue
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 12:27:38 +08:00
PhyxionNL e44699216e Fix readability of chart hover 2022-04-14 12:27:38 +08:00
DX37 fd8cba1dad nudge nodemailer strings; translate new ones 2022-04-14 11:10:24 +08:00
sovushik 03dd02fd38 Update ru-RU.js
Add RU for 1.14 version
2022-04-14 11:04:46 +08:00
ColdThunder11 4656ab3d57 Add OneBot notification service 2022-04-14 10:58:28 +08:00
MrEddX 60b44c2cdd Update bg-BG.js
Fixed translation.
2022-04-14 09:46:43 +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 6f72ca481f
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
2022-04-14 00:05:07 +08:00
Louis Lam 670ea415b2
Merge pull request #1488 from c0derMo/update-german-translation
updating german translation
2022-04-14 00:03:53 +08:00
Louis Lam 17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
2022-04-13 23:47:08 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
c0derMo f5d006add8 updating german translation 2022-04-13 14:45:41 +00:00
AnnAngela-work 5aa747a301 New translation 2022-04-12 20:41:25 +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
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 772d009f43 Merge branch 'master' into fluencydoc_master
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
2022-04-12 17:44:04 +08:00
Louis Lam 9ec29c1bc4 Add back debug() for safe, but it is marked as deprecated 2022-04-12 16:37:05 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
2022-04-12 16:32:14 +08:00
Louis Lam a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +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 a2d9474e85 Copy some keys from zh-TW to zh-HK 2022-04-09 14:51:26 +08:00
Louis Lam 8479e772cd
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation
Update zh-TW translation
2022-04-09 14:44:44 +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
JohnnyChiang 25b5edea7f Update zh-TW translation 2022-04-08 01:47:01 +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
Louis Lam 70311f7a5a Add an option to enable/disable the domain name expiry notification #1364 2022-04-05 21:27:50 +08:00
Louis Lam 4b99160b1f Fix "Check Update" is not checked by default 2022-04-05 19:43:23 +08:00
AnnAngela-work 8e78e62eee Make translation better 2022-04-04 17:24:22 +08:00
AnnAngela 706d6cee07
Update some components to use i18n function, update en & zh-CN translation 2022-04-04 11:33:02 +08:00
AnnAngela-work 43eed45bae first part of zh-CN.js translation 2022-04-03 22:08:24 +08:00
AnnAngela-work 19b7e2ba5e Using grep to search $t("foo")-like pattern to fill up the missing part of en i18n file 2022-04-03 22:08:03 +08:00
Louis Lam 3218a0eee8 Merge remote-tracking branch 'origin/master' 2022-04-02 11:26:24 +08:00
Louis Lam 87ee3c20bd Update proxy password field 2022-04-02 11:25:27 +08:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
2022-04-01 14:57:35 +08:00
Balázs Csaba 53cea7f8d3 fix: update hu lang 2022-03-31 22:25:22 +02:00
Louis Lam aef7719426
Merge pull request #1435 from LoaderB0T/favico
feat: Favicon is updated based on satus page logo
2022-03-31 21:32:13 +08:00
Louis Lam 514b9fb68a Add remark 2022-03-31 21:30:07 +08:00
Louis Lam da32a1aa19 Add uk-UA to the languageList 2022-03-31 16:24:28 +08:00