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 |
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 |
|
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 |
|
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 |
