TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-06-13 08:02:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
1621 commits 37 branches 120 tags 80 MiB
Commit graph

181 commits

Author SHA1 Message Date
Bert Verhelst
ef654506cd Merge branch 'master' into feature/monitor-checks 2021-10-16 09:20:17 +02: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
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
495350b417 Merge branch 'master' into feature/monitor-checks 2021-10-10 18:44:50 +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
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
Bert Verhelst
bb5f9a0dbd Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-09 10:47:59 +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
Bert Verhelst
c6a8d555cf Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-06 11:50:11 +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
Bert Verhelst
1a7b69d4aa fix(monitor-checks): use helper for saving monitor checks 2021-10-01 11:49:19 +02:00
Bert Verhelst
dc86117b2f fix(monitor-checks): fix json backup import 2021-10-01 11:31:20 +02:00
Bert Verhelst
2c910885b8 feat(monitor-checks): ensure old exports are converted to the new format 2021-10-01 10:53:17 +02:00
Bert Verhelst
70ac68368d Merge remote-tracking branch 'origin/master' into feature/monitor-checks 2021-10-01 09:08:00 +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
Bert Verhelst
937df66eda Merge remote-tracking branch 'origin/master' into feature/monitor-checks 2021-09-29 11:48:58 +02:00
Bert Verhelst
b8dc487468 feat(monitor-checks): fix validation of checks 2021-09-29 11:48:49 +02:00
Louis Lam
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor 
Fix: clear important beats after deleteMonitor
 2021-09-29 15:39:57 +08:00
Bert Verhelst
5a29df40ec fix(monitor-checks): save checks to the database 2021-09-29 09:26:31 +02:00
Bert Verhelst
07a37534b1 feat(monitor-checks): try to get monitor checks fetched and stored in db 2021-09-27 17:17:34 +02:00
Bert Verhelst
5943c76dfb Merge remote-tracking branch 'bertyhell/feature/monitor-checks' into feature/monitor-checks 2021-09-26 15:00:21 +02:00
LouisLam
0afa3a2c21 Merge branch '1.6.X' 
# Conflicts:
#	server/database.js
#	server/server.js
 2021-09-24 19:12:57 +08:00
Nelson Chan
662c97dcde
Fix: Fix importing tag if tag doesn't exist 2021-09-24 14:34:53 +08:00
Ponkhy
7fb55b8875 Fixed issues 2021-09-23 17:31:01 +02:00
Nelson Chan
32c9dfbb31 Fix: clear important beats after deleteMonitor 2021-09-23 23:21:08 +08:00
Ponkhy
d3d4363031 Used compare-version instead of replace 2021-09-23 17:15:11 +02:00
LouisLam
23a63213aa Merge branch 'master' into import-export 
# Conflicts:
#	server/server.js
 2021-09-23 17:20:13 +08:00
LouisLam
15c00d9158 upload logo and expose ./data/upload to url 2021-09-21 21:22:35 +08:00
LouisLam
a8e170f6a8 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/server.js
 2021-09-20 18:48:44 +08:00
LouisLam
34c0fa59a8 fix reset-password (#448) 
(cherry picked from commit b0e9c5bcb4)
 2021-09-20 16:33:22 +08:00
LouisLam
b0e9c5bcb4 fix reset-password (#448) 2021-09-20 16:29:18 +08:00
Bert Verhelst
fc261825a9 Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-09-20 09:05:44 +02:00
Bert Verhelst
20e3c5061e feat(monitor-checks): add checks with specific types 2021-09-20 09:00:21 +02:00
Ponkhy
1b5e723f60 Added descriptions to uploadBackup function 2021-09-17 03:25:18 +02:00
Ponkhy
4bdada36a9 Removed if includes version 2021-09-16 20:18:31 +02:00