ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-25 07:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2133 commits 30 branches 115 tags 64 MiB
Commit graph

468 commits

Author SHA1 Message Date
Adam Stachowicz
fa5ba12e14 Missing this 2021-10-24 22:15:02 +02:00
Adam Stachowicz
85053f865e Fix typo 2021-10-24 21:56:37 +02:00
Adam Stachowicz
1239f6d1a2 PL update + fixes 2021-10-24 21:50:02 +02:00
Tarun Singh
fed611d1b9 Merge branch 'master' of https://github.com/louislam/uptime-kuma 2021-10-24 15:19:25 -04:00
Tarun Singh
bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Louis Lam
90200958cd
Merge pull request #780 from kry008/patch-4 
Update pl.js
 2021-10-25 00:35:31 +08:00
Ponkhy
d82f305f6e Updated german language file 2021-10-24 17:56:05 +02:00
kry008
b5eb17ed93
Update pl.js 2021-10-23 15:07:24 +02:00
Andreas Brett
4becb97a5d
Update en.js 2021-10-23 01:54:36 +02:00
Andreas Brett
85e2b36424
Update en.js 2021-10-23 01:54:07 +02:00
Andreas Brett
abdf1ae90a
Update en.js 2021-10-23 01:53:31 +02:00
Andreas Brett
606c967985
Merge branch 'master' into patch-6 2021-10-23 01:52:54 +02:00
Andreas Brett
9ad8e5f56a show logged in user 2021-10-22 13:05:52 +02:00
Louis Lam
d74577608b
Merge pull request #766 from DX37/translation-ru 
Update notifications area in ru-RU.js
 2021-10-22 14:10:15 +08:00
Phuong Nguyen Minh
060dde9827
Merge branch 'louislam:master' into master 2021-10-22 08:08:22 +07:00
DX37
1d1601cf24
Update notifications area in ru-RU.js 2021-10-21 22:49:17 +07:00
DX37
29e4e41215
Update ru-RU.js 2021-10-20 23:00:29 +07:00
MrEddX
d0b0c64b81
Update bg-BG.js 
- Fixed existing fields
- Added new fields
- Translated new fields
 2021-10-19 23:03:46 +03:00
Daniel Patrón Gómez
5a05d135b8
Add steam translation in spanish 2021-10-19 17:11:32 +02:00
NeuralMiner
a35569481d Updates 2021-10-18 15:26:38 -06:00
NeuralMiner
572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
Louis Lam
20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Daniel Patrón Gómez
0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Daniel Patrón Gómez
15f36f96c3 Add spanish translation for monitor history 2021-10-16 12:15:39 +02:00
Bert Verhelst
61627545a5 fix(edit-monitor): no need to escape placeholder {} if not translated 2021-10-16 11:26:32 +02:00
Louis Lam
cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
januridp
d94fbede32 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:39:32 +07:00
januridp
4e4f94ab98 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:29:51 +07:00
januridp
ed3a558397 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:15:01 +07:00
Louis Lam
4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam
cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Phuong Nguyen Minh
bda481c61e
Update vi.js 2021-10-15 08:26:33 +07:00
iooner
8242a1586d
Update fr-FR.js 2021-10-14 22:23:01 +02:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject 
Add support for custom subject in emails
 2021-10-15 00:54:31 +08:00
firattemel
2f0119bc3f Update tr-TR.js 2021-10-14 17:29:13 +03:00
Louis Lam
8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
Louis Lam
674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +08:00
hrtkpf
84507268ad fix translations (de-DE and en) 2021-10-13 11:13:51 +02:00
zsxeee
33f773fcd0
Move param out of the translation file 2021-10-13 15:36:07 +08:00
zsxeee
26841a64f0
Update zh-CN.js 2021-10-13 15:10:59 +08:00
Phuong Nguyen Minh
dc805cff97
Add files via upload 2021-10-13 13:36:09 +07:00
KangAlleW
7c9ed98408 rename id.js to id-ID.js 2021-10-13 02:57:36 +07:00
KangAlleW
5b67fec084 add indonesian language 2021-10-13 02:46:11 +07:00
dhfhfk
05b691d4c9
Fix typo 2021-10-12 20:39:15 +09:00
Kyungyoon Kim
c1112a32df
Update ko-KR.js 2021-10-12 18:19:44 +09:00
Kyungyoon Kim
efc78acfeb
Update ko-KR.js 2021-10-12 18:17:13 +09:00
zsxeee
9e01959d15
Update zh-CN.js 2021-10-12 16:30:39 +08:00
zsxeee
3fe91c52cb
Fix i18n 
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
 2021-10-12 16:29:18 +08:00
Louis Lam
b7528b9a4e
Merge pull request #657 from thomasleveil/patch-2 
[i18n] minor fixes to french translations
 2021-10-12 02:17:53 +08:00
Thomas LÉVEIL
9c058054b9 [i18n] minor update to french translations 2021-10-11 19:55:02 +02:00
Louis Lam
c6683e2a9b
Merge pull request #648 from atlochowski/patch-1 
Update pl.js
 2021-10-12 00:04:33 +08:00
Atlochowski
69ffee55dd
Update pl.js 2021-10-11 14:33:00 +02:00
Atlochowski
ebf0671fef
Update pl.js 2021-10-11 13:45:25 +02:00
wuwenjing
6d9b71c054 Add Feishu notification 2021-10-11 17:20:09 +08:00
Atlochowski
a433de74e6
Update pl.js 
small fix
 2021-10-11 09:24:45 +02:00
Andreas Brett
503d1f0a91
translation fixes 2021-10-10 23:20:56 +02:00
Louis Lam
ad0cde6554
Merge pull request #633 from dhfhfk/master 
Update ko-KR
 2021-10-11 01:04:32 +08:00
Louis Lam
25d18f0da3
Merge pull request #636 from DanielRTRD/add-norwegian-lang 
Add Norwegian Language
 2021-10-11 01:03:55 +08:00
RisedSky
ecc25ba596
Update fr-FR.js 
Fixed wrong string
Also, "Primary Base URL" is missing from english file
 2021-10-10 19:02:35 +02:00
LouisLam
e5286b0973 eslint for ko-KR.js 2021-10-11 00:52:46 +08:00
Daniel S. Billing
037fdd73a3 Norsk 2021-10-10 18:50:18 +02:00
Daniel S. Billing
bb9a936658 Translated some of the notifications services 2021-10-10 18:49:03 +02:00
Bert Verhelst
dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-10 18:40:53 +02:00
Daniel S. Billing
f0ff96afd9 Create nb-NO.js 2021-10-10 18:31:17 +02:00
RisedSky
afb75e07d5
Update fr-FR.js 
Fixed string (Device => Appareil in French)
 2021-10-10 17:37:05 +02:00
RisedSky
efd3822930
Update fr-FR.js 
All the lines corresponds to the English version (sorted correctly)
Plus, updated all the translated strings
 2021-10-10 17:33:02 +02:00
dhfhfk
2adac64c83
Update ko-KR.js 2021-10-11 00:02:37 +09:00
LouisLam
272d4bde45 find promossms language key typo 2021-10-10 13:19:10 +08:00
Louis Lam
0c88e4b2f6
Merge pull request #629 from NixNotCastey/pl-update 
Polish translation update
 2021-10-10 12:45:26 +08:00
Louis Lam
5c6230da58
Merge pull request #630 from xinac721/master 
Update Simplified Chinese Language（更新简体中文语言）
 2021-10-10 12:43:17 +08:00
新逸Cary
54f864a1bb Update Simplified Chinese Language（更新简体中文语言） 2021-10-10 10:04:07 +08:00
Lukas
d6f7be9112 Translated all missing texts and updated few of previously translated. 2021-10-10 00:38:19 +02:00
Lukas
792f3c7c5c Add support for values of Name, Hostname and Status 2021-10-09 21:48:28 +02:00
Bert Verhelst
8a739af5ad Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-09 21:44:22 +02:00
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject 2021-10-09 20:37:12 +02:00
Lukas
5e3ea3293c Very basic email subject customization 2021-10-09 20:32:45 +02:00
Louis Lam
1f7f20526f
Merge pull request #620 from MrEddX/bulgarian 
Update bg-BG.js
 2021-10-10 01:12:38 +08:00
Robin Schneider
6fe014fa5e
Fixed spelling for german language support 
Fixed spelling for german language support, hacktoberfest-accepted label woul be appreciated.
 2021-10-09 18:05:52 +02:00
Nelson Chan
6cf2eb036d Fix: Improve settings layout and wording 2021-10-09 23:51:05 +08:00
MrEddX
9d7def93a5
Update bg-BG.js 2021-10-09 18:44:12 +03:00
Nelson Chan
dca5a59dbc Feat: Implement data clearing logic & frontend 2021-10-09 23:33:47 +08:00
Kyungyoon Kim
2e95e2016d
Translate to Korean 2021-10-09 05:25:49 -06:00
Bert Verhelst
d71d27220b fix(edit-monitor): store headers as JSON 2021-10-09 12:42:32 +02:00
Bert Verhelst
b8093e909b fix(edit-monitor): fix minification of translations containing { } 2021-10-09 11:38:12 +02:00
Bert Verhelst
daab2a05f5 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-09 11:13:16 +02:00
Daniel Patrón Gómez
d7eac1a413
Update es-ES.js 2021-10-08 23:48:37 +02:00
Lukas
12b5489eb5 PromoSMS as Notification Provider 
Add PromoSMS (Polish SMS Gateway) as new notification provider
 2021-10-07 21:56:32 +02:00
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
Bert Verhelst
ec4b7e4064 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 18:22:59 +02:00
LouisLam
2c19aef4dc minor 2021-10-07 18:06:43 +08:00
Louis Lam
5eb3c6b194
Merge branch 'master' into bulgarian 2021-10-07 15:12:53 +08:00
LouisLam
8233f3b875 try to standardize the language name list 2021-10-07 15:06:16 +08:00
Bert Verhelst
8be4bf0e16 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 08:56:29 +02:00
LouisLam
cccf393ee5 update zh-HK.js 2021-10-07 14:55:32 +08:00
MrEddX
1eb3f63a82
Update bg-BG.js 2021-10-07 09:27:05 +03:00
Louis Lam
8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n 
Notification form i18n
 2021-10-07 14:13:08 +08:00
Bert Verhelst
162ef04c41 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-06 21:56:28 +02:00
jtagcat
7626e1f2e4 l10n: update et 2021-10-06 21:02:34 +03: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
Louis Lam
52102d72a0
Merge pull request #572 from Brainpitcher/patch-1 
Update ru-RU.js
 2021-10-06 15:28:29 +08:00
Brainpitcher
7a8b6a03e0
Update ru-RU.js 
"Cert Exp.": "Сертификат истекает" now it sounds in russian
 2021-10-06 09:49:44 +05:00
Gero Gerke
5decfb9fad Matrix Notifications 2021-10-05 20:03:56 +02:00
Bert Verhelst
a0ffa42b42 fix(translations): add translations for method body and headers to dutch 2021-10-05 18:21:31 +02:00
Bert Verhelst
afeb424dc0 fix(edit-monitor): add translations to en.js 2021-10-05 09:20:24 +02:00
Adam Stachowicz
707e05c330 Fix after merge 2021-10-04 23:39: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
Louis Lam
387a8919f9
Merge pull request #542 from csabibela/master 
Hungarian translation
 2021-10-04 21:14:12 +08:00
Csábi Béla
980342546e Merge branch 'hu' 2021-10-03 23:38:13 +02:00
Csábi Béla
6b60dc9630 Initial Hungarian translation 2021-10-03 23:15:34 +02:00
Csábi Béla
8d22b43f24 Revert "Initial Hungarian translation" 
This reverts commit dad58341c6.
 2021-10-03 23:11:19 +02:00
Csábi Béla
dad58341c6 Initial Hungarian translation 2021-10-03 23:09:17 +02:00
jtagcat
275902be38 update estonian translation 2021-10-03 20:35:41 +03:00
jtagcat
38213585f3 update style for et translation 
kuigi pingviini stiilijuhend
https://viki.pingviin.org/Stiilijuhend_tarkvara_t%C3%B5lkimiseks
on otseses konfliktis (ok:seiskamine;nok:seiska),
tundub nupudel nok ikkagi paremini

nupud on ikkagi käsk, mitte tegevus

muutus ühtlustab ka nuppude keele
 2021-10-03 20:35:30 +03:00
LouisLam
51acd107e3 Merge branch 'master' into notification_form_i18n 2021-10-03 15:28:33 +08:00
Louis Lam
9d079eeec0
Merge pull request #487 from cmandesign/feature/fa-lang-rtl 
Feature/fa lang rtl
 2021-10-01 16:28:20 +08: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
Soroosh
f2c7308c96 Fixed Change Language Direction In Setting Page 2021-09-29 10:44:34 +03:30
LouisLam
6d65d248f4 Merge branch 'bulgarian' 
# Conflicts:
#	src/languages/da-DK.js
#	src/languages/fr-FR.js
#	src/languages/it-IT.js
#	src/languages/pl.js
#	src/languages/ru-RU.js
#	src/languages/zh-CN.js
 2021-09-29 13:28:43 +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
kry008
99818aa370
Update pl.js 
Aby było że to serwer sprawdza, a nie użytkownik ma.
Dokończenie tłumaczenia
 2021-09-27 21:58:18 +02:00
Louis Lam
682265fe9c
Merge pull request #481 from DX37/translation-ru 
fix some ru-RU lines and add new ones
 2021-09-28 00:13:37 +08:00
Louis Lam
4406e51ab6
Merge pull request #496 from bertyhell/bugfix/remove-zero-width-spaces 
fix(nl-NL): remove ZWSP from translation
 2021-09-28 00:13:16 +08:00
Louis Lam
c3d5be5a5e
Merge pull request #493 from iomataani/master 
updated translation
 2021-09-28 00:08:12 +08:00
Louis Lam
dfe12c99c1
Merge pull request #490 from Minvinea/master 
Update fr-FR.js
 2021-09-28 00:07:58 +08:00
Louis Lam
bb69851160
Merge pull request #485 from Lrss/patch-1 
Update Danish translation
 2021-09-28 00:07:44 +08:00
Bert Verhelst
8e9fa20e57 fix(nl-NL): remove ZWSP from translation 2021-09-27 17:51:48 +02:00
Ioma Taani
da7c29f4b9 updated translation 2021-09-27 13:23:53 +02:00
Denis Freund
b67b4d5afd add steam gameserver for monitoring 2021-09-27 11:17:57 +02:00
Soroosh
1448de7b19 Update some translations 2021-09-27 00:32:51 +03:30
Minvinea
e545d48583
Update fr-FR.js 
Update line 112 to 181
 2021-09-26 21:39:38 +02:00
Soroosh
04b7a4a423 Merge Conflict Resolved 
Farsi Lang Updated
Some hardcoded words has been replaced with translations
 2021-09-26 19:56:25 +03:30
Soroosh
07c9d78829 Update Farsi translations 2021-09-26 18:52:53 +03:30
Lars Sørensen
8d84d8f891
Update da-DK.js with new strings 2021-09-26 15:28:46 +02:00
新逸Cary
74acc2cea7 Update Simplified Chinese Language（更新简体中文语言） 2021-09-26 14:31:16 +08:00
Soroosh
251d42f1a6 Add localeDirection method to i18n.js 
Add dir to html tag based on localeDirection
Add Farsi to the languages
 2021-09-26 01:09:00 +03:30
DX37
122631c91b
fix some ru-RU lines and add new ones 2021-09-26 01:44:00 +07:00
Ponkhy
50a33e3b45 Added german translation for the status page 2021-09-24 15:56:35 +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
Ioma Taani
09e38269c6
Merge branch 'louislam:master' into master 2021-09-19 09:45:42 +02:00
Louis Lam
c3f1cebeab
Merge pull request #435 from DX37/translation-ru 
fresh translations to ru-RU.js and Settings.vue
 2021-09-19 00:37:37 +08:00
Louis Lam
5d9814559c
Merge pull request #424 from Saibamen/fix_PL 
Fix polish translation and translate new keys
 2021-09-19 00:37:23 +08:00
DX37
9ef45a9c7e
fresh translations to ru-RU.js and Settings.vue 2021-09-18 22:25:06 +07:00
Ioma Taani
ca84044809
Merge branch 'louislam:master' into master 2021-09-17 23:05:56 +02:00
Marcos Sigueros Fernández
c3122a9807
Update es-ES.js (#430) 
Simple but annoying language fix.
 2021-09-17 22:20:45 +08:00
Ioma Taani
cbbc503f8e
Merge branch 'louislam:master' into master 2021-09-17 11:31:21 +02:00
zsxeee
e9735d239b
Convert notification form to separate component 2021-09-17 16:07:03 +08:00
Adam Stachowicz
250c2bdd6d Missing this 2021-09-16 20:17:25 +02:00
Adam Stachowicz
8e49d84050 Fix polish translation and translate new keys 2021-09-16 20:13:57 +02:00
kry008
a04878fa84
Finishing the translation of PL (#422) 2021-09-16 22:49:24 +08:00
Ioma Taani
783ec97004 updated translations 2021-09-16 09:10:13 +02:00
Adam Stachowicz
217637aa1f Add de-DE translation 2021-09-15 21:19:16 +02:00
Adam Stachowicz
ab22961538 More info about update-language-files command 2021-09-15 21:16:22 +02:00
Adam Stachowicz
8ba8de07ae Missing this 2021-09-15 20:59:29 +02: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
Ioma Taani
0752f810f1 updated 2021-09-15 08:33:30 +02:00
samet.kum
7274913686 Turkish Language added 2021-09-15 02:55:04 +03: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
Jelle Posthuma
40d301457a Update new / updated translations to nl_NL 2021-09-14 09:22:50 +02:00
LouisLam
c746923018 merge italian language file 2021-09-13 20:05:48 +08:00
LouisLam
df8754827d Merge branch 'italian-language-update' 
# Conflicts:
#	src/languages/it-IT.js
 2021-09-13 20:04:46 +08:00
LouisLam
600ec6d171 Merge branch 'master' into i18n_router_own_files 2021-09-13 19:58:14 +08:00
Paride Barison
6a925c7ed4 sistemato l'ordine 2021-09-13 09:19:07 +02:00
Paride Barison
8b9b86b478 updated 2021-09-13 09:10:42 +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
Adam Stachowicz
54ffef8b7a Own files for i18n and router + fix some of markdown warnings 2021-09-12 19:23:51 +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
LouisLam
8205f90f3d update language files 2021-09-13 00:45:43 +08: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
Louis Lam
9d39071a91
Merge pull request #363 from Ponkhy/2fa 
Added simple TOTP Two Factor Authentication
 2021-09-12 23:47:42 +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
jtagcat
b80c88d9a0 i10n: update Estonian 2021-09-12 00:51:03 +03:00