Louis Lam
|
e03ee593e2
|
Merge pull request #716 from NeuralMiner/textchanges
Text update
|
3 years ago |
|
Louis Lam
|
6c1ee70e15
|
fix
|
3 years ago |
|
Louis Lam
|
5c3892313e
|
add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN
|
3 years ago |
|
Louis Lam
|
c57c94642c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
Louis Lam
|
62f168a2a5
|
config response header
|
3 years ago |
Andreas Brett
|
acc2995d86
|
invalidate used token
|
3 years ago |
NeuralMiner
|
9ddffc0f7f
|
Updates
|
3 years ago |
|
NeuralMiner
|
76e7c8b276
|
Rebase
|
3 years ago |
|
NeuralMiner
|
572a5300aa
|
Recommended updates.
|
3 years ago |
NeuralMiner
|
e1f1d4a959
|
Merge branch 'louislam:master' into textchanges
|
3 years ago |
|
Louis Lam
|
23714ab688
|
genSecret don't need `await`
|
3 years ago |
|
Louis Lam
|
6e18f39eb4
|
[steam] code cleanup
|
3 years ago |
|
Louis Lam
|
ae31eb6ba9
|
Merge branch 'master' into Revyn112_master
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
|
3 years ago |
|
Louis Lam
|
cb43ecb46e
|
Merge branch 'master' into background-jobs
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
|
3 years ago |
|
Louis Lam
|
6ff3cb275e
|
Merge pull request #642 from andreasbrett/patch-2
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
|
3 years ago |
|
NeuralMiner
|
8cb26d2b31
|
Text update
|
3 years ago |
|
Louis Lam
|
7276f34d90
|
fix reset-password
|
3 years ago |
|
Louis Lam
|
4e71ab7406
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
Louis Lam
|
f75c9e4f0c
|
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
|
3 years ago |
giacomo892
|
3fe3450533
|
Prioritize port passed from args
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
giacomo892
|
d733ec018e
|
Prioritize host arg
Otherwise launching the program with the --host argument does nothing
|
3 years ago |
|
Andreas Brett
|
2538bd04ce
|
notp verification defaults
|
3 years ago |
|
Andreas Brett
|
e223e826a3
|
linting
|
3 years ago |
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)
|
3 years ago |
Bert Verhelst
|
dc08510e72
|
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
82131f4dd2
|
merge conflict
|
3 years ago |
|
LouisLam
|
56ae6f6117
|
fix demoMode export
|
3 years ago |
|
LouisLam
|
5c89562650
|
not allow lower than 20s for demo mode
|
3 years ago |
Nelson Chan
|
656a4d6270
|
WIP: Enable background jobs
WIP: Remove better-sqlite3
|
3 years ago |
|
Bert Verhelst
|
fba4f86552
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
23a2d33f8c
|
[backup] restore pushToken
|
3 years ago |
|
Bert Verhelst
|
daab2a05f5
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
fc8d1e78b6
|
[push type] hide upside down mode, apply primary base url
|
3 years ago |
|
Bert Verhelst
|
162ef04c41
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
49720c709c
|
improve the test with a single command only "npm test"
|
3 years ago |
|
Bert Verhelst
|
3f0b85e5a8
|
feat(http-requests): add support for methods, body and headers for http
|
3 years ago |
|
LouisLam
|
b246c8e0f2
|
Fix 2fa for iOS Google authenticator (#486)
|
3 years ago |
|
LouisLam
|
1ed4ac9494
|
add Push-based monitoring (#279)
|
3 years ago |
|
Louis Lam
|
fbc8828ddc
|
Merge pull request #464 from chakflying/fix-delete-monitor
Fix: clear important beats after deleteMonitor
|
3 years ago |
Denis Freund
|
b67b4d5afd
|
add steam gameserver for monitoring
|
3 years ago |
|
LouisLam
|
0afa3a2c21
|
Merge branch '1.6.X'
# Conflicts:
# server/database.js
# server/server.js
|
3 years ago |
|
Nelson Chan
|
662c97dcde
|
Fix: Fix importing tag if tag doesn't exist
|
3 years ago |
Ponkhy
|
7fb55b8875
|
Fixed issues
|
3 years ago |
|
Nelson Chan
|
32c9dfbb31
|
Fix: clear important beats after deleteMonitor
|
3 years ago |
|
Ponkhy
|
d3d4363031
|
Used compare-version instead of replace
|
3 years ago |
|
LouisLam
|
23a63213aa
|
Merge branch 'master' into import-export
# Conflicts:
# server/server.js
|
3 years ago |
|
LouisLam
|
15c00d9158
|
upload logo and expose ./data/upload to url
|
3 years ago |
|
LouisLam
|
a8e170f6a8
|
Merge branch 'master' into public-dashboard
# Conflicts:
# server/server.js
|
3 years ago |
|
LouisLam
|
34c0fa59a8
|
fix reset-password (#448)
(cherry picked from commit b0e9c5bcb4)
|
3 years ago |
|
LouisLam
|
b0e9c5bcb4
|
fix reset-password (#448)
|
3 years ago |
|
Ponkhy
|
1b5e723f60
|
Added descriptions to uploadBackup function
|
3 years ago |
|
Ponkhy
|
4bdada36a9
|
Removed if includes version
|
3 years ago |
|
LouisLam
|
2955abb5d9
|
[status page] create incident
|
3 years ago |
|
Ponkhy
|
8b463e70df
|
Apply suggestions from @Saibamen
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
LouisLam
|
392f8275b3
|
Merge branch 'master' into public-dashboard
# Conflicts:
# server/database.js
|
3 years ago |
|
Ponkhy
|
54aa68ec58
|
Added import/export compatibility for version 1.7
|
3 years ago |
|
Louis Lam
|
72783fd94c
|
Merge pull request #380 from No0Vad/retry-heartbeat-interval
Added support for a retry interval to monitors
|
3 years ago |
|
LouisLam
|
80322cbfe7
|
Merge branch 'import-export'
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
|
3 years ago |
|
LouisLam
|
7e0272077b
|
cleanup demo mode code
|
3 years ago |
|
LouisLam
|
512ff09cca
|
set entry page
|
3 years ago |
|
LouisLam
|
1d6670ed9a
|
Merge branch 'master' into public-dashboard
|
3 years ago |
|
LouisLam
|
3234aec5b3
|
NODE_ENV if not set, change to production
|
3 years ago |
|
LouisLam
|
9902c181bc
|
Merge branch 'master' into public-dashboard
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
|
3 years ago |
|
Louis Lam
|
069c811af8
|
Merge pull request #278 from chakflying/tags
Monitor: Tags with metadata
|
3 years ago |
|
LouisLam
|
f9311e4e7f
|
[status page]
|
3 years ago |
|
LouisLam
|
d7a230ac15
|
Merge branch 'master' into public-dashboard
# Conflicts:
# server/server.js
# src/main.js
|
3 years ago |
|
LouisLam
|
97360dab26
|
add /.well-known/change-password
|
3 years ago |
|
Nelson Chan
|
a0e4e96160
|
Fix: Fix tag removal, reuse and validation
|
3 years ago |
|
Nelson Chan
|
6e3a904aaa
|
WIP: Add tags functionality
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
|
3 years ago |
No0Vad
|
91ee39ec60
|
Merge branch 'master' into retry-heartbeat-interval
|
3 years ago |
|
LouisLam
|
f47f7758f9
|
Merge branch 'master' into public-dashboard
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
|
3 years ago |
|
Ponkhy
|
d313966d80
|
Merge branch 'master' into import-export
|
3 years ago |
|
Ponkhy
|
7fee4a7ea7
|
Added import options
|
3 years ago |
|
LouisLam
|
c4f78d776e
|
[2fa] "UptimeKuma" to "Uptime Kuma"
|
3 years ago |
|
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.
|
3 years ago |
|
LouisLam
|
934685637a
|
[Status Page] WIP: Checkpoint
|
3 years ago |
|
Ponkhy
|
f6d1a82989
|
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Ponkhy
|
651b525d06
|
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
LouisLam
|
3e25f0e9d9
|
[Status Page] WIP: Checkpoint
|
3 years ago |
|
Ponkhy
|
59cccf8c50
|
Fixed typo
|
3 years ago |
|
Ponkhy
|
403202d4d4
|
Added simple TOTP Two Factor Authentication
|
3 years ago |
|
LouisLam
|
573c7faddd
|
switch on the notification, if it is added in EditMonitor.vue
|
3 years ago |
|
Ponkhy
|
1ef4562905
|
Paused monitors stay paused after import
|
3 years ago |
|
LouisLam
|
62712f5cc4
|
Merge branch 'master' into import-export
|
3 years ago |
|
LouisLam
|
da74391c3e
|
convert notifications into modules
|
3 years ago |
Ponkhy
|
242e494cb5
|
Merge branch 'master' into import-export
|
3 years ago |
|
LouisLam
|
299506ce45
|
reset the heartbeat list instead of reload the page after cleared events or heartbeats
|
3 years ago |
|
Ponkhy
|
8f9a973ede
|
Merge branch 'master' into import-export
|
3 years ago |
|
LouisLam
|
ebf362754c
|
Merge branch 'master' into clear-monitor-data
|
3 years ago |
|
LouisLam
|
e31be8caf5
|
demo mode
|
3 years ago |
|
LouisLam
|
60f2f08cea
|
add demo db
|
3 years ago |
|
LouisLam
|
b1647a310e
|
add demo db
|
3 years ago |
|
Ponkhy
|
7d70c4d8cd
|
Code optimizations
|
3 years ago |
|
LouisLam
|
f23ecef636
|
add missing cert parameters
|
3 years ago |
|
LouisLam
|
51cf2ff6f9
|
add missing cert parameters
|
3 years ago |
|
LouisLam
|
b30b1d3a52
|
create data dir before copy
|
3 years ago |
|
LouisLam
|
582e14098d
|
create data dir before copy
|
3 years ago |
|
LouisLam
|
6e3e2fc85c
|
fix db path
|
3 years ago |
|
LouisLam
|
3ee13bddd1
|
dash style for args
|
3 years ago |
|
LouisLam
|
c74986647e
|
allow changing data dir
|
3 years ago |
|
LouisLam
|
b88b357b55
|
add support for https
|
3 years ago |
|
Ponkhy
|
2dd392e609
|
Added uptime kuma version to backup file
|
3 years ago |
|
Ponkhy
|
c13cc62d3d
|
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Ponkhy
|
2f6c5963c5
|
Added import and export function
|
3 years ago |
|
Ponkhy
|
7b92166d18
|
Added clear all db statistics function
|
3 years ago |
|
Ponkhy
|
1952e34110
|
Added the possibility to clear monitor data
|
3 years ago |
|
LouisLam
|
46ac753c46
|
Merge branch 'master' into dns-monitor
|
3 years ago |
|
LouisLam
|
397fd12081
|
remove unused import
|
3 years ago |
|
LouisLam
|
46cb955172
|
afterLogin change to non blocking
|
3 years ago |
|
Ponkhy
|
c79be19ec3
|
Added DNS Monitor Type
|
3 years ago |
|
LouisLam
|
4571a9b8c1
|
check update
|
3 years ago |
|
LouisLam
|
209e44c2e1
|
prevent all monitors making requests at the same moment when start the server
|
3 years ago |
|
LouisLam
|
30b8d3d0ab
|
prevent all monitors making requests at the same moment when start the server
|
3 years ago |
|
LouisLam
|
440c178403
|
change sqlite to WAL mode
|
3 years ago |
|
LouisLam
|
61e758d872
|
disable pool for sqlite, re-use a connection to improve the performance.
|
3 years ago |
|
LouisLam
|
7a32e5e6ff
|
catch rejection error globally
|
3 years ago |
|
LouisLam
|
eed6d3e847
|
add more query log for dev env
|
3 years ago |
|
LouisLam
|
d5149f90b4
|
fix ping
|
3 years ago |
|
LouisLam
|
70e7945a66
|
fix possible race condition
|
3 years ago |
|
LouisLam
|
b413427a37
|
graceful shutdown when listen error
|
3 years ago |
|
LouisLam
|
d93f6e2716
|
server.listen bind to ipv6 too
|
3 years ago |
|
LouisLam
|
d6fad7f1ef
|
server.listen bind to ipv6 too
|
3 years ago |
|
LouisLam
|
ba1d271afa
|
fix jwt error
|
3 years ago |
|
LouisLam
|
b69185ee9e
|
control search engine visibility
|
3 years ago |
|
LouisLam
|
d0aad3400c
|
add reset password in cli
|
3 years ago |
|
LouisLam
|
f9cb8293f3
|
improve a bit ux
|
3 years ago |
Adam Stachowicz
|
46c7e5d058
|
Save `maxredirects` on edit
|
3 years ago |
|
LouisLam
|
3265c3cbc3
|
improve multiselect
|
3 years ago |
|
Nelson Chan
|
a50aa93e84
|
Fix: Fix monitor creation json parsing
|
3 years ago |
|
LouisLam
|
adcd251076
|
Merge branch 'master' into redirects&status
|
3 years ago |
|
LouisLam
|
a40816b948
|
fix high severity vulnerabilities by using my fork sqlite3 package
|
3 years ago |
|
Nelson Chan
|
8f7885e58a
|
Feat: Implement MaxRedirects & StatusCodes
|
3 years ago |
|
LouisLam
|
dffe3cf8f2
|
Revert "try to support subdirectory reverse proxy"
This reverts commit a03dd91e40.
|
3 years ago |
|
LouisLam
|
a03dd91e40
|
try to support subdirectory reverse proxy
|
3 years ago |
|
LouisLam
|
38c0c170e7
|
add some comments
|
3 years ago |
|
Nelson Chan
|
655536e457
|
Fix: use send() instead of end() (#161)
|
3 years ago |
|
LouisLam
|
d707eba046
|
fix disable auth
|
3 years ago |
|
LouisLam
|
6f868c9ec3
|
implement no auth
|
3 years ago |
|
LouisLam
|
c6a66fad79
|
add setting for disable auth
|
3 years ago |
|
LouisLam
|
60aa67892d
|
store ignoreTls and upsideDown into db
|
3 years ago |
|
LouisLam
|
5a053e5875
|
parse the port to int
|
3 years ago |
|
LouisLam
|
081abcb6a1
|
add util.ts for sharing common functions between frontend and backend
|
3 years ago |
|
LouisLam
|
063697c20a
|
set the port by env.PORT, specific node version in package.json
|
3 years ago |
|
LouisLam
|
7dbec90c95
|
cache index.html and fix basic auth applied to all routes
|
3 years ago |
|
LouisLam
|
6bce270f42
|
cleanup code
|
3 years ago |
|
LouisLam
|
4a9690437f
|
Merge branch 'eslint_stylelint'
# Conflicts:
# server/server.js
|
3 years ago |
|
Nelson Chan
|
ac0f418294
|
Fix: passwordHash is not imported
|
3 years ago |
|
Adam Stachowicz
|
9648d700d7
|
Autofix on save
|
3 years ago |
|
LouisLam
|
209fa83cff
|
Add Basic Auth for /metrics
|
3 years ago |
|
LouisLam
|
934b797623
|
Merge branch 'master' into feature/add_prometheus_metrics
# Conflicts:
# server/model/monitor.js
|
3 years ago |
