github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity
1,043 Commits
41 Branches
120 Tags
40 MiB
Commit Graph

48 Commits (80322cbfe7cf88f6d128cff8627e53761b17d4b0)

Author SHA1 Message Date
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
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
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
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
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
Louis Lam 331ae5ec20
Merge pull request #306 from Ponkhy/import-export 
Added import and export function
 2021-09-09 16:15:48 +08:00
Ponkhy 69a7c4dab4 Improved importBackup handling 2021-09-07 23:14:44 +02:00
LouisLam 1a5ffd4755 add description for export/import 2021-09-08 00:46:48 +08:00
LouisLam 62712f5cc4 Merge branch 'master' into import-export 2021-09-08 00:18:43 +08:00
LouisLam 0aeaf87f5b Merge branch 'master' into default-notification 
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
 2021-09-07 23:40:42 +08:00
LouisLam 4a106431f3 convert Telegram into a vue components 2021-09-07 23:32:05 +08:00
Ponkhy 242e494cb5
Merge branch 'master' into import-export 2021-09-07 14:12:53 +02:00
Ponkhy 4faa409027
Merge branch 'master' into default-notification 2021-09-07 14:07:50 +02:00
LouisLam fe35d95441 merge language files 2021-09-07 17:38:04 +08:00
LouisLam da131a5156 Merge branch 'master' into clear-monitor-data 
# Conflicts:
#	src/languages/da-DK.js
#	src/languages/en.js
#	src/languages/es-ES.js
#	src/languages/fr-FR.js
#	src/languages/ja.js
#	src/languages/ko-KR.js
#	src/languages/nl-NL.js
#	src/languages/ru-RU.js
#	src/languages/sr-latn.js
#	src/languages/sr.js
#	src/languages/sv-SE.js
#	src/languages/zh-CN.js
#	src/languages/zh-HK.js
 2021-09-07 17:36:37 +08:00
Ponkhy fd8c95d64e
Merge branch 'master' into default-notification 2021-09-05 23:32:31 +02:00
Ponkhy 58240aceef Added the option for default notifications 2021-09-05 23:23:06 +02:00
Ponkhy 1b8b33c4c3 Added set language to the Setup.vue 2021-09-05 15:40:35 +02:00
LouisLam d5b32ffbb8 add language missing keys 2021-09-05 02:25:40 +08:00
Ponkhy 0b9e410ea5 Added i18n key to en.js 2021-09-04 13:36:08 +02:00
Ponkhy 904ed326ca
Merge branch 'louislam:master' into clear-monitor-data 2021-09-04 13:34:29 +02:00
Ponkhy 8f9a973ede
Merge branch 'master' into import-export 2021-09-04 01:26:48 +02:00
Ponkhy b98ec0c3d4 Added i18n keys if necessary for some languages 2021-09-04 01:26:06 +02:00
Adam Stachowicz 7a109689d9 Make `Resp. Time (ms)` and `N/A` i18n 2021-09-01 21:17:50 +02:00
Ponkhy b604910bbb
Merge branch 'master' into clear-monitor-data 2021-09-01 17:17:40 +02:00
LouisLam c7e6cb9f37 update language files 2021-09-01 20:10:54 +08:00
LouisLam ad38e61c26 add language file preparation script 2021-09-01 17:08:27 +08:00
Ponkhy 7b92166d18 Added clear all db statistics function 2021-09-01 00:36:24 +02:00
Ponkhy 1952e34110 Added the possibility to clear monitor data 2021-08-29 18:47:01 +02:00
Ponkhy dd877cfc70 Added translation to pause monitor confirmation 2021-08-29 04:03:55 +02:00
Ponkhy 6464207f4b Added German language for DNS Monitor 2021-08-27 18:41:58 +02:00
Ponkhy 2b8c5e2e65 Added German Language 2021-08-26 02:43:26 +02:00
LouisLam 28a51d806b translate to Traditional Chinese (Hong Kong) 2021-08-24 18:26:44 +08:00
LouisLam dd4c00eed3 add vue i18n 2021-08-24 16:44:58 +08:00