Commit graph

79 commits

Author SHA1 Message Date
LouisLam
ddad2dcb4a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/languages/en.js
2021-10-08 01:40:34 +08:00
LouisLam
e96121f69a fix merging mistake 2021-10-08 01:39:14 +08:00
LouisLam
2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications
# Conflicts:
#	src/languages/en.js
2021-10-08 00:59:39 +08:00
zsxeee
54d2fbcc02
Fix i18n
Prevent use esm-bundler build vue-i18n
Escape keyword:  '@'
2021-10-06 18:21:31 +08:00
LouisLam
c8706b9aa1 Merge branch 'master' into notification_form_i18n
# Conflicts:
#	src/components/notifications/SMTP.vue
#	src/languages/en.js
2021-10-06 16:48:14 +08:00
Gero Gerke
5decfb9fad Matrix Notifications 2021-10-05 20:03:56 +02:00
Adam Stachowicz
8ae64843fc run update-language-files 2021-10-04 23:32:16 +02:00
Adam Stachowicz
23e64b8efd Merge branch 'master' into fix_pl_i18n 2021-10-04 23:29:21 +02:00
zsxeee
0f2059cde0
Use named slot translation when has multi-slot 2021-09-30 19:48:24 +08:00
zsxeee
138ddf5608
Move attribute tag to start of tag 2021-09-30 19:22:17 +08:00
zsxeee
dcd68213b1
Merge remote-tracking branch 'upstream/master' into notification_form_i18n
# Conflicts:
#	src/languages/en.js
2021-09-30 19:16:14 +08:00
Louis Lam
55cb497301
Merge pull request #427 from zsxeee/notification_component
chore(NotificationDialog): Convert notification form to separate component
2021-09-30 17:53:36 +08:00
MrEddX
0f66e5cfc5 Added Bulgarian Language 2021-09-28 23:21:59 +03:00
Adam Stachowicz
58aa83331e Fix Polish language, add missing Status Page i18n 2021-09-28 06:53:23 +02:00
zsxeee
f24abac7fc
Merge branch 'master' into notification_component 2021-09-24 20:33:29 +08:00
LouisLam
266b03fbf7 language key from "Status Page Nothing" to "statusPageNothing" 2021-09-24 14:42:54 +08:00
Cosmo Abdon
a4cad3db65 add: BR Portuguese Language and new words 2021-09-23 09:42:33 -03:00
zsxeee
624f632a7a
Apprise status translation key 2021-09-22 22:15:50 +08:00
zsxeee
6e9d12638c
Avoid space ending in translation key 2021-09-22 16:20:59 +08:00
zsxeee
6e55c44773
Chore 2021-09-22 16:13:23 +08:00
zsxeee
601204ae77
Default friendly name i18n and auto increase 2021-09-21 17:25:54 +08:00
zsxeee
8c941b1d56
Add i18n for notification form 2021-09-21 13:02:41 +08:00
zsxeee
ad6fcc2f2e
Merge branch 'master' into notification_component 2021-09-20 13:16:24 +08:00
Adam Stachowicz
7dc1e84e44 Avg. Ping and Avg. Response translation keys 2021-09-19 15:15:12 +02:00
zsxeee
e9735d239b
Convert notification form to separate component 2021-09-17 16:07:03 +08:00
Adam Stachowicz
79920b5f2c Fix languages after 80322cbfe7
Fix ESLint deprecated warning. Update `README.md` for  languages. Update `update-language-files` script
2021-09-15 20:52:39 +02:00
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
LouisLam
80322cbfe7 Merge branch 'import-export'
# Conflicts:
#	src/languages/it-IT.js
#	src/languages/nl-NL.js
2021-09-16 00:18:07 +08:00
No0Vad
1300448bed Adjustments to the retry interval
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
2021-09-15 00:59:06 +02:00
Ponkhy
fff5fd8e9e Added search key 2021-09-14 17:48:29 +02:00
Ponkhy
c14b71a4a7 Added german translation for tags manager 2021-09-14 17:05:17 +02:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval 2021-09-13 00:19:51 +02:00
Ponkhy
4711aeb355
Merge branch 'master' into import-export 2021-09-12 23:21:33 +02:00
Adam Stachowicz
7199bb5ead Remove unused i18n key 2021-09-12 23:11:07 +02:00
LouisLam
7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export 2021-09-12 18:46:11 +02:00
Louis Lam
c52b9b63d5
Merge pull request #389 from Ponkhy/default-notification
Wording correction for notification modal
2021-09-12 23:49:09 +08:00
Louis Lam
e55193270d
Merge pull request #377 from Lrss/master
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-12 23:48:29 +08:00
Ponkhy
db14768229 Wording correction for notification modal 2021-09-12 01:44:05 +02:00
No0Vad
3d27561e5a Update en.js
Fixed spelling error
2021-09-12 00:24:33 +02:00
Ponkhy
862672731f Minor typo fix 2021-09-11 22:06:26 +02:00
Ponkhy
7fee4a7ea7 Added import options 2021-09-11 21:53:17 +02:00
No0Vad
f8f9f59464 Added support for a retry interval to monitors
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa 2021-09-11 16:32:11 +02:00
Ponkhy
d003abcd60
Update src/languages/en.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:23 +02:00
Lars Sørensen
66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title. 2021-09-11 13:52:41 +02:00
Ponkhy
c3c576bd13 Added "Show URI" translation 2021-09-10 01:33:26 +02:00
Ponkhy
c62732fa9c Minor translation fixes 2021-09-10 01:24:21 +02:00
Ponkhy
403202d4d4 Added simple TOTP Two Factor Authentication 2021-09-09 21:10:31 +02:00
LouisLam
94a6c1a344 update language files 2021-09-09 20:38:19 +08:00