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