Commit Graph

683 Commits

Author SHA1 Message Date
Matthew Nickson d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-24 01:06:45 +01:00
OidaTiftla c7ec9a07e2 Add translation for text label 2022-04-21 17:59:38 +02:00
OidaTiftla b7e2489d22
Merge branch 'master' into introduce-resend-interval 2022-04-21 11:58:04 +02: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
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
Koen Habets 59d9891105
Update nl-NL.js 2022-04-19 21:17:33 +02: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 5fa62a888c Merge branch 'master' into mqtt2
# Conflicts:
#	server/database.js
#	server/util-server.js
2022-04-17 19:46:33 +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 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 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
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
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 6f72ca481f
Merge pull request #1479 from AnnAngela/1.14.0_translation
New translation for zh-CN
2022-04-14 00:05:07 +08:00
c0derMo f5d006add8 updating german translation 2022-04-13 14:45:41 +00:00
Moritz R 361e44ad6a
Merge branch 'louislam:master' into master 2022-04-13 15:58:17 +02:00
AnnAngela-work 5aa747a301 New translation 2022-04-12 20:41:25 +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 c399984b7f Improve status page sidebar 2022-04-09 17:03:10 +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
JohnnyChiang 25b5edea7f Update zh-TW translation 2022-04-08 01:47:01 +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
Moritz R af44b0beab
Merge branch 'master' into master 2022-04-03 17:19:29 +02: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 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 c50c20faa4 Minor fix for uk-UA 2022-03-31 16:19:04 +08:00
Denis Stepanov ee3d7d8b42
Add ukrainian translation 2022-03-30 23:21:09 +03:00
Denis Stepanov a277cfe9e8
Add ukrainian translation 2022-03-30 23:16:04 +03:00
DX37 61d0a0abce
update russian translation 2022-03-28 21:16:13 +07:00
OidaTiftla 91366ff565
Merge branch 'master' into introduce-resend-interval 2022-03-27 21:19:57 +02:00
sovushik e11ea7b061
Update ru-RU.js
Add new string for 1.13.1
2022-03-26 10:46:07 +05:00
Ivan Bratović 5922771909 Update croatian (hr-HR) translation file
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
2022-03-25 11:05:51 +01:00
Louis Lam 5a2a59250d
Merge pull request #1405 from sovushik/patch-9
Update ru-RU.js
2022-03-22 17:17:37 +08:00
sovushik 210eebe144
Update ru-RU.js
Add some fix for 1.13
2022-03-22 13:00:16 +05:00
sovushik 4b04a9c214
Update ru-RU.js
Add new string for version 1.13
2022-03-22 12:58:38 +05:00
MrEddX f65d0654a6
Update bg-BG.js
Added new field.
2022-03-21 21:12:15 +02:00
burakurer 73d904952d
Update tr-TR.js
spelling correction "Sağlık Dırımları" => "Sağlık Durumları"
2022-03-20 17:03:32 +03:00
Louis Lam c22cc4d794
Merge pull request #1385 from jtagcat/patch-1
Update et-EE.js
2022-03-20 10:56:24 +08:00
Kyungyoon Kim 2f5beefa37
Update ko-KR.js 2022-03-19 03:19:02 -06:00
jtagcat dae5ff690a
Update et-EE.js 2022-03-18 13:56:45 +00:00
jtagcat dc3da45dd6
Update et-EE.js 2022-03-18 11:27:33 +00:00
Louis Lam 37be7df9b0 [Status Page] Delete status page 2022-03-18 15:19:52 +08:00
Louis Lam 78a732409b [Status Page] Fix translations 2022-03-17 18:56:59 +08:00
Louis Lam d765b1c57a Merge branch 'master' into restructure-status-page
# Conflicts:
#	src/pages/StatusPage.vue
2022-03-12 15:50:42 +08:00
Louis Lam c65d771fad
Merge pull request #1358 from BCsabaEngine/master
fix: .hu lang
2022-03-12 10:38:37 +08:00
Louis Lam 50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Louis Lam ae14ad5a84 Add a word "Status Pages" 2022-03-09 22:14:07 +08:00
MrEddX edd9202de9
Update bg-BG.js
Translation fix.
2022-03-08 22:14:07 +02:00
MrEddX a97d2a5498
Update bg-BG.js
Added new fields.
2022-03-08 22:10:17 +02: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
Balázs Csaba 157f0de61a fix: .hu lang 2022-03-05 21:24:50 +01:00
Louis Lam 8bbf55777e
Merge pull request #1205 from arjunkomath/master
Add notification provider - Push
2022-03-04 21:39:59 +08:00
Louis Lam c52c8a4206 Merge branch 'master' into alerta
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
2022-03-04 14:10:37 +08:00
Louis Lam 9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam ccb3d85a48
Merge pull request #1157 from zackelia/master
Implement gorush notifications
2022-03-03 22:03:09 +08:00
deluxghost b3a690f3b1
Update zh-CN.js 2022-03-02 23:12:30 +08:00
Louis Lam 7bc8c447cd Merge branch 'MikMuellerDev_master'
# Conflicts:
#	src/languages/de-DE.js
2022-03-02 17:17:15 +08:00
DX 0dba06e48b Update zh-CN translations 2022-03-02 15:34:11 +08:00
Louis Lam 0671e4ea2b Merge remote-tracking branch 'AnnAngela/master'
# Conflicts:
#	src/languages/zh-CN.js
2022-03-02 13:43:34 +08:00
Louis Lam cd8eaef903
Merge pull request #1187 from pfandie/translations-de
Updates some DE translations
2022-03-02 13:39:19 +08:00
Louis Lam 51f5c009e3 Merge remote-tracking branch 'PrikolMen/patch-1'
# Conflicts:
#	src/languages/ru-RU.js
2022-03-02 13:37:21 +08:00
Louis Lam 3bf62c9ceb Merge branch 'patch-7-ru'
# Conflicts:
#	src/languages/ru-RU.js
2022-03-02 13:33:37 +08:00
Louis Lam 7b11539cff Merge branch 'patch-62'
# Conflicts:
#	src/languages/ru-RU.js
2022-03-02 13:31:43 +08:00
PrikolMen:-b b4a3d68356
More correct Russian translation
I tried to fix most of the shortcomings of the Russian translation...
2022-02-28 14:55:23 +04:00
Louis Lam 60f67ccb35 Revert commit: a6fd626f 2022-02-26 16:57:13 +08:00
Louis Lam a6fd626fb8 Locked Russian language, ask Putin to stop the war and unlock it 2022-02-26 14:56:57 +08:00
Balázs Csaba f3112c0b85 fix: hu lang 2022-02-23 09:35:56 +01:00
Louis Lam af07850ddf
Merge pull request #1287 from sovushik/patch-5
Update ru-RU.js
2022-02-21 15:12:27 +08:00
Mik Mueller a997f8e4f9 Update de-DE.js 2022-02-15 12:58:02 +01:00
Mik Mueller 09dbb143ea
Merge branch 'louislam:master' into master 2022-02-15 12:51:21 +01:00
Hans Mayer f19e983818
Merge remote-tracking branch 'origin/master' into translations-de 2022-02-14 14:39:21 +01:00
Louis Lam 986ddd92ff
Merge pull request #1198 from Buchtic/master
CSY translation
2022-02-13 14:11:00 +08:00
AnnAngela c75c6c5640
Update zh-CN.js
Update DingDing and AliyunSms setting dialogs for better translations and document links
2022-02-11 22:50:46 +08:00
AnnAngela 5aed36b470
Update zh-CN
----
关于 smtpDkimKeySelector:
Google Workspace 的帮助里用词为
[前缀选择器](https://annangela.page.link/smtpDkimKeySelector)
2022-02-10 22:45:24 +08:00
sovushik 76b9fb967f
Update ru-RU.js
Add new string
2022-02-09 21:37:45 +05:00
sovushik b58120d258
Update ru-RU.js
Correct some words on Russian
2022-02-09 21:26:47 +05:00
sovushik 79f99ce215
Update ru-RU.js
Add new string
2022-02-09 21:19:00 +05:00
Louis Lam efaa55ad1f
Merge pull request #1269 from holao09/master
Update Vietnamese language
2022-02-09 21:42:02 +08:00
Việt Nguyễn daac9ddffc Update Vietnamese language
Cập nhật một số thông tin tiếng Việt
2022-02-09 16:17:10 +07:00
rovast 45dca072b2 Update zh-CN translation for setting module. 2022-02-07 15:28:21 +08:00
Mik Mueller 7d8b72c6c0
Merge branch 'louislam:master' into master 2022-02-06 10:57:10 +01:00
Hans Mayer 40cc885eb8
resolve conflict after update state 2022-02-05 11:48:48 +01:00
Mik Mueller f1007ad42f Update de-DE.js 2022-02-02 22:59:13 +01:00
Mik Mueller dd28ecaa2d Update de-DE.js 2022-02-02 22:57:02 +01:00
Mik Mueller ffa585376d
Merge branch 'louislam:master' into master 2022-02-02 22:54:23 +01:00
dave9123 c1c1e2ba5b
Fixed the grammar issue
Here's my pull request
2022-02-02 10:13:55 +07:00
Louis Lam 2f7e24191a
Merge pull request #1237 from dave9123/patch-1
[id-ID] Fixed some grammar error
2022-02-02 00:31:50 +08:00
vfaergestad 0fce1b4b9b
Update nb-NO.js (#1232)
Improved and finished the translation.
2022-02-02 00:31:00 +08:00
Mik Mueller 11c2e86bfe
Update src/languages/de-DE.js
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
2022-02-01 08:13:30 +01:00
Mik Mueller 1bbf17f3da
Update src/languages/de-DE.js
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
2022-02-01 08:13:23 +01:00
Mik Mueller 39f8b30b36
Update src/languages/de-DE.js
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
2022-02-01 08:13:13 +01:00
Mik Mueller ffb2c2996b
Update src/languages/de-DE.js
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
2022-02-01 08:12:42 +01:00
dave9123 65896ed035
Fixed some grammar error
I fixed at some part of the text.
2022-01-31 08:01:45 +07:00
Mik Mueller b13b20bd95 improve certain German words and phrases, improve grammer in README.md 2022-01-30 00:17:25 +01:00
Phuong Nguyen Minh a9df7b4a14
Update vi.js (#1226)
* update vi.js
2022-01-28 21:23:37 +08:00
Alvin Pergens cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
OidaTiftla d446a57d42 Add german translation 2022-01-24 22:20:48 +01:00
OidaTiftla 855b12f435 Add text for resend disabled 2022-01-24 22:20:38 +01:00
OidaTiftla 8c4ab9d652 Simplify 2022-01-24 09:18:22 +01:00
OidaTiftla 11e9eee09d Change seconds to minutes 2022-01-23 17:48:09 +01:00
c0derMo 29df70949d Add ability to connect to daemon via http / tcp for windows compatibility 2022-01-22 01:57:37 +00:00
Arjun Komath 74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Louis Lam ff0e85737f
Merge pull request #1182 from sovushik/patch-4
Update ru-RU.js
2022-01-19 14:37:08 +08:00
Buchtič 4713820da7
first csy translation 2022-01-18 14:44:11 +01:00
Buchtič 60f1eb7b45
new cs-CZ.js 2022-01-17 18:42:32 +01:00
Louis 6961af005e eslint 2022-01-18 01:12:25 +08:00
Roy Feng 847a19afc1 Update zh-CN.js 2022-01-17 15:03:39 +08:00
Louis Lam 7532e7fd3e
Merge pull request #1192 from drodmantras/master
Update sl-SI.js
2022-01-17 14:18:27 +08:00
Erik 63a3704836 Update sl-SI.js 2022-01-16 12:29:00 +01:00
Hans Mayer 3e87eb596f
change wording, according to PR suggestions 2022-01-15 12:25:17 +01: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 c5cc42272f Fixing the editing of docker container & adding english translation 2022-01-13 18:28:45 +00:00
sovushik 329c8cbc2d
Update ru-RU.js
Add new string
2022-01-13 22:07:21 +05:00
Louis Lam 2bf9764cec
Merge pull request #1175 from sovushik/patch-3
Update ru-RU.js
2022-01-13 13:18:23 +08:00
Louis Lam 32ec4beda0 Merge branch 'master' into mqtt 2022-01-13 11:24:45 +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
sovushik 52e0d74a1e
Update ru-RU.js
Add new string
2022-01-12 20:49:41 +05:00
Adam Stachowicz 23532aaafe
Update pl.js
Addendum to ab61acab63
2022-01-12 12:26:23 +01:00
Łukasz Szczepański 06aab3dee8 Added missing text and fix typos 2022-01-12 09:48:37 +01:00
Louis Lam 9f063cf477
Merge branch 'master' into patch-2 2022-01-10 17:56:47 +08:00
Louis Lam b83c896d0c
Merge pull request #1150 from sovushik/patch-1
Update ru-RU.js
2022-01-10 17:55:46 +08:00
Louis Lam 5e2c39eb4b
Merge pull request #1144 from alex3025/master
Fixed italian (it-IT) translations
2022-01-10 17:54:22 +08:00
Louis Lam 2a1f011f05
Merge pull request #1153 from drodmantras/master
Update sl-SI.js
2022-01-10 17:53:03 +08:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Erik cdcdf377ec Update sl-SI.js
Small langue updates
2022-01-09 11:39:05 +01:00
sovushik 30a345d8b6
Update ru-RU.js
Updated language files and added new lines
2022-01-08 23:00:18 +05:00
sovushik 83d60fea29
Update ru-RU.js
1. Updated the language lines (in the correct declension)
2. Added new lines for the "Create Incident" functionality
2022-01-08 22:46:05 +05:00
Matteo D 2304c53c8d Fixed some translations
And made them more user-friendly.
2022-01-08 13:28:48 +01:00
Philipp Bischoff bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
MrEddX 69dfc0c0d2
Update bg-BG.js
Fixed some typos.
2022-01-05 08:15:34 +02:00
Louis Lam f9c0ff1841
Merge pull request #1109 from iomataani/master
Updated translation
2022-01-03 20:05:46 +08:00