Commit Graph

975 Commits

Author SHA1 Message Date
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
LouisLam
7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08: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
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
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
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
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
LouisLam
2da77d8448 fix ipv6 connection problem 2021-09-11 14:37:05 +08:00
Louis Lam
f8322de5da
Update bug_report.md 2021-09-11 13:44:06 +08:00
Louis Lam
e21a18a593
Update ask-for-help.md 2021-09-11 13:41:22 +08:00
Ponkhy
14b7688b70 Added NOT NULL to twofa_status 2021-09-11 00:13:05 +02:00
LouisLam
ef1604675b change to node:14-bullseye-slim, and reduce the docker image size 2021-09-11 02:50:29 +08:00
Louis Lam
83fc844e8e
Update deployment.yml 2021-09-10 22:32:11 +08:00
Louis Lam
22a7acbaf6
Update README.md 2021-09-10 22:03:28 +08:00
LouisLam
201bba63d7 add a healthcheck comment 2021-09-10 21:17:20 +08:00
LouisLam
31b4a5c33e build-docker, debian first 2021-09-10 18:08:23 +08:00
LouisLam
a49df29a87 update to 1.6.0 2021-09-10 17:56:33 +08:00
LouisLam
08de0090dc add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0 2021-09-10 17:23:45 +08:00
Louis Lam
97df200d6c
Merge pull request #365 from Ponkhy/master
Minor translation fixes
2021-09-10 11:46:20 +08:00
Louis Lam
d5b17a3778
Merge pull request #367 from xinac721/master
update Simplified Chinese language(更新简体中文语言)
2021-09-10 11:45:57 +08:00
新逸Cary
2f0d994c83 update Simplified Chinese language(更新简体中文语言) 2021-09-10 09:26:01 +08:00
新逸Cary
e683033f4e
Merge pull request #2 from louislam/master
update
2021-09-10 08:52:38 +08: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