Commit graph

4446 commits

Author SHA1 Message Date
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
LouisLam
f47f7758f9 Merge branch 'master' into public-dashboard
# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js
2021-09-13 01:09:01 +08: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
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
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
No0Vad
389d247463
Update server/database.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 17:05:23 +02: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
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
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
LouisLam
c4f78d776e [2fa] "UptimeKuma" to "Uptime Kuma" 2021-09-12 02:25:51 +08: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
LouisLam
934685637a [Status Page] WIP: Checkpoint 2021-09-11 23:43:07 +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
LouisLam
3e25f0e9d9 [Status Page] WIP: Checkpoint 2021-09-11 19:40:03 +08: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
Adam Stachowicz
c387fb264e Format JSON file before download 2021-09-11 10:50:56 +02:00
LouisLam
4b0a8087a2 do not connect to socket io for status page 2021-09-11 16:22:30 +08:00
LouisLam
08c7a37052 Merge branch 'master' into public-dashboard 2021-09-11 15:09:08 +08:00
LouisLam
0969be5981 Revert "WIP: Add login page, nav bar buttons"
This reverts commit b9a6088f50.
2021-09-11 15:08:56 +08:00
LouisLam
2ed8f12dc0 Merge remote-tracking branch 'origin/master' 2021-09-11 14:46:04 +08:00