Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Louis
ed64853125
Keep FBSD, BSD for ping only
3 years ago
Denis
0f822d3b2a
FBSD does not exists anymore
3 years ago
Denis
6bda5c6329
update comment
3 years ago
Louis
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
3 years ago
Marc Harnos
0bbe157099
change parsing priority for all passed arguments
...
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
3 years ago
Marc Harnos
0053a29d10
add validation to port value parsing
...
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
3 years ago
Marc Harnos
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
3 years ago
Nelson Chan
1bbd744d02
Chore: Improve syntax
3 years ago
Nelson Chan
2e0e35a1ee
Fix: Fix typo
3 years ago
Nelson Chan
1e92487f30
Chore: Remove onDelete as unused
3 years ago
Nelson Chan
edd2534a1b
Fix: Clear metrics also on stop and edit
3 years ago
Nelson Chan
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
3 years ago
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
3 years ago
Andreas Brett
a13bdaac84
Merge branch 'master' into logging
3 years ago
Fluency
e3745da986
Merge branch 'master' into master
3 years ago
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
Louis Lam
c811c1ccde
Merge pull request #753 from chakflying/settings-redesign
...
UI: Redesign/organize settings page
3 years ago
Andreas Brett
ed96757b24
Merge branch 'louislam:master' into logging
3 years ago
Louis Lam
5d3bf68123
add remove-2fa command
3 years ago
Nelson Chan
7f4d5a0f76
Test: fix tests
...
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Investigate error message
Test: Attempt to fix tests
Chore: Cleanup code
Test: Attempt to fix tests
Test: Attempt to fix tests
3 years ago
Nelson Chan
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
3 years ago
Andreas Brett
e5913c5abc
separate log functions
3 years ago
Andreas Brett
bdcdf47e52
introduce consistent logging
3 years ago
Calum Bird
f55350bebc
Generated documentation :)
3 years ago
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
3 years ago
Louis Lam
c094dc0c5b
speed up redirect by using 302 redirect instead of vue redirect
3 years ago
Louis
ba93129b18
Merge branch '1.9.X'
...
# Conflicts:
# server/server.js
3 years ago
Louis
caa2a34177
fix 2fa not working #833
3 years ago
Louis
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
Louis Lam
a9e319517a
add auto vacuum and shrink database button
3 years ago
Nelson Chan
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
3 years ago
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
3 years ago
Louis Lam
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
3 years ago
Louis Lam
b77b33e790
add login rate limiter
3 years ago
Louis Lam
56094a43d7
add passwordStrength
3 years ago
Louis Lam
cd04ac4557
"dist/index.html" is no longer needed for development environment
3 years ago
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