Commit Graph

195 Commits

Author SHA1 Message Date
Nelson Chan
07742799ed Test: Fix tests
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
2021-11-17 10:45:19 +08:00
Louis Lam
c094dc0c5b speed up redirect by using 302 redirect instead of vue redirect 2021-11-02 21:48:46 +08:00
Louis
ba93129b18 Merge branch '1.9.X'
# Conflicts:
#	server/server.js
2021-10-30 10:05:08 +08:00
Louis
caa2a34177 fix 2fa not working #833 2021-10-30 02:35:05 +08:00
Louis
d7f7dba13f write some error logs to ./data/error.log 2021-10-29 18:24:47 +08:00
Louis Lam
a9e319517a add auto vacuum and shrink database button 2021-10-26 23:02:32 +08:00
Nelson Chan
2f7b60f5e5 Feat: Use separate storage for custom chart period
Fix: Fix import error
2021-10-24 01:44:55 +08:00
Nelson Chan
b83c59e308 WIP: Add options for chart period
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
2021-10-24 01:44:08 +08:00
Louis Lam
d578300104
Merge pull request #743 from andreasbrett/patch-4
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
2021-10-23 17:00:46 +08:00
Louis Lam
b77b33e790 add login rate limiter 2021-10-23 16:35:13 +08:00
Louis Lam
56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam
cd04ac4557 "dist/index.html" is no longer needed for development environment 2021-10-20 01:32:19 +08:00
Louis Lam
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
Text update
2021-10-19 16:34:00 +08:00
Louis Lam
6c1ee70e15 fix 2021-10-19 16:29:09 +08:00
Louis Lam
5c3892313e add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN 2021-10-19 14:41:05 +08:00
Louis Lam
c57c94642c Merge remote-tracking branch 'origin/master' 2021-10-19 14:26:26 +08:00
Louis Lam
62f168a2a5 config response header 2021-10-19 14:26:10 +08:00
Andreas Brett
acc2995d86 invalidate used token 2021-10-19 00:42:33 +02:00
NeuralMiner
9ddffc0f7f Updates 2021-10-18 14:35:47 -06:00
NeuralMiner
76e7c8b276 Rebase 2021-10-18 14:35:36 -06:00
NeuralMiner
572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam
23714ab688 genSecret don't need await 2021-10-18 17:37:11 +08:00
Louis Lam
6e18f39eb4 [steam] code cleanup 2021-10-18 17:15:28 +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
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
Louis Lam
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
2021-10-16 14:30:25 +08:00
NeuralMiner
8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
Louis Lam
7276f34d90 fix reset-password 2021-10-16 00:57:26 +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
Louis Lam
f75c9e4f0c add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD 2021-10-14 14:09:16 +08:00
giacomo892
3fe3450533
Prioritize port passed from args
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 08:29:55 +02:00
giacomo892
d733ec018e
Prioritize host arg
Otherwise launching the program with the --host argument does nothing
2021-10-12 19:37:58 +02:00
Andreas Brett
2538bd04ce notp verification defaults 2021-10-11 20:18:40 +02:00
Andreas Brett
e223e826a3 linting 2021-10-11 01:02:54 +02:00
Andreas Brett
b5b391c73b
avoid default values for token verification
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640)
2021-10-10 22:13:18 +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
LouisLam
82131f4dd2 merge conflict 2021-10-10 13:09:30 +08:00
LouisLam
56ae6f6117 fix demoMode export 2021-10-10 02:36:20 +08:00
LouisLam
5c89562650 not allow lower than 20s for demo mode 2021-10-10 02:23:27 +08:00
Nelson Chan
656a4d6270 WIP: Enable background jobs
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
Bert Verhelst
fba4f86552 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-09 12:35:08 +02:00
LouisLam
23a2d33f8c [backup] restore pushToken 2021-10-09 17:45:05 +08: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
LouisLam
fc8d1e78b6 [push type] hide upside down mode, apply primary base url 2021-10-08 20:03:52 +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
LouisLam
49720c709c improve the test with a single command only "npm test" 2021-10-05 19:13:57 +08:00
Bert Verhelst
3f0b85e5a8 feat(http-requests): add support for methods, body and headers for http 2021-10-02 16:48:27 +02:00
LouisLam
b246c8e0f2 Fix 2fa for iOS Google authenticator (#486) 2021-10-01 00:23:18 +08:00
LouisLam
1ed4ac9494 add Push-based monitoring (#279) 2021-10-01 00:09:43 +08:00