Commit graph

996 commits

Author SHA1 Message Date
LouisLam 0e16e88fa8 Merge remote-tracking branch 'origin/master' 2021-09-13 20:06:24 +08: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
Louis Lam 2c02dad1f9
Merge pull request #393 from Revyn112/master
add possibility to have a prefixMessage in discord notification before the embed
2021-09-13 20:02:55 +08:00
LouisLam 600ec6d171 Merge branch 'master' into i18n_router_own_files 2021-09-13 19:58:14 +08:00
LouisLam 728636de06 Merge branch 'feature/timezones-package' 2021-09-13 19:56:57 +08:00
LouisLam 8be7fd5c45 Merge remote-tracking branch 'bertyhell/feature/timezones-package' 2021-09-13 19:56:29 +08:00
LouisLam 59ff9fa293 update missing timezone console msg 2021-09-13 19:53:29 +08:00
LouisLam a654e409df Merge branch 'master' into feature/timezones-package 2021-09-13 19:48:42 +08:00
LouisLam 76f1f34a0a fix #397, incorrect encode function for export file 2021-09-13 19:25:12 +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
Louis Lam 50175b733c
Merge pull request #396 from Ponkhy/2fa
Hide 2FA section if disabled auth
2021-09-13 09:16:09 +08:00
Ponkhy bb87972543 Hide 2FA section if disabled auth 2021-09-12 21:58:52 +02:00
Adam Stachowicz 5abf2e7597 Missing this 2021-09-12 19:44:33 +02:00
Adam Stachowicz 7c83bed273 Remove double spaces in Dockerfiles 2021-09-12 19:43:14 +02:00
Adam Stachowicz 1cc788da68 Missing this 2021-09-12 19:39:28 +02:00
Adam Stachowicz 54ffef8b7a Own files for i18n and router + fix some of markdown warnings 2021-09-12 19:23:51 +02:00
Revyn112 44aa837a9d
Update NotificationDialog.vue 2021-09-12 19:17:09 +02:00
Bert Verhelst ddcd3c2a19 Merge remote-tracking branch 'origin/master' into feature/timezones-package 2021-09-12 19:03:05 +02:00
LouisLam 7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Bert Verhelst 471333ad03 fix(util-frontend): revert typescript conversion 2021-09-12 18:56:39 +02:00
LouisLam 8205f90f3d update language files 2021-09-13 00:45:43 +08:00
LouisLam 02247c4174 Merge remote-tracking branch 'origin/master' 2021-09-13 00:38:17 +08:00
Denis Freund 8352d9abbe add posibility to have a prefixMessage before the embed 2021-09-12 17:54:12 +02:00
Louis Lam 2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings
fix(settings): add some button bottom margin for narrow screens
2021-09-12 23:49:21 +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
Bert Verhelst a170694a83
fix(util-frontend): improve formatting timezoneList
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 15:21:40 +02:00
Bert Verhelst 5969e913b5
fix(util-frontend): improve formatting
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 15:19:27 +02:00
Louis Lam 0d280f5edb
Merge pull request #376 from chakflying/patch-7
Fix: Fix events table width on mobile
2021-09-12 21:12:56 +08:00
Bert Verhelst 660b969178 fix(settings): switch custom styles to bootstrap class for bottom margin 2021-09-12 14:52:47 +02:00
Bert Verhelst c26622aa39 fix(settings): add some button bottom margin for narrow screens 2021-09-12 13:40:07 +02:00
Bert Verhelst a7674755ba Move timezones to npm package and convert util-frontend.js to typescript 2021-09-12 13:27:41 +02:00
Louis Lam 6d7cb44acc
Merge pull request #387 from jtagcat/et2
i10n: update Estonian
2021-09-12 14:03:02 +08:00
LouisLam 400fc13cf2 add npm install script for npm7 2021-09-12 12:39:22 +08:00
Ponkhy db14768229 Wording correction for notification modal 2021-09-12 01:44:05 +02:00
jtagcat b80c88d9a0 i10n: update Estonian 2021-09-12 00:51:03 +03:00
LouisLam c4f78d776e [2fa] "UptimeKuma" to "Uptime Kuma" 2021-09-12 02:25:51 +08:00
Ponkhy 295ccba44b Adjusted for new db patch management 2021-09-11 16:37:33 +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
Ponkhy f6d1a82989
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:19 +02:00
Ponkhy 651b525d06
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:12 +02:00
Lars Sørensen 66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title. 2021-09-11 13:52:41 +02:00
Lars Sørensen 39c7b5e748
Added new Strings to Danish translation 2021-09-11 13:37:53 +02:00
Lars Sørensen b709857e19
Better wording for Danish language 2021-09-11 13:20:40 +02:00
Nelson Chan 9e10f7d35f
Fix: Fix events table width on mobile 2021-09-11 18:56:27 +08:00
Louis Lam 6caae725f9
Merge pull request #375 from Saibamen/format_backup_json
Format JSON file before download
2021-09-11 16:57:33 +08:00