LouisLam
|
ddad2dcb4a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/languages/en.js
|
3 years ago |
|
LouisLam
|
5b4af550fb
|
Merge branch 'master' into DeeJayPee_master
|
3 years ago |
|
LouisLam
|
3a0143ac46
|
[matrix] use encodeURIComponent to handle the url encode
|
3 years ago |
|
LouisLam
|
2ce5c28ed4
|
Merge branch 'master' into feature/matrix-notifications
# Conflicts:
# src/languages/en.js
|
3 years ago |
Bert Verhelst
|
ec4b7e4064
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
e5f6d7f047
|
slack and rocket.chat use the primary base url
env var to show time logger
|
3 years ago |
|
Bert Verhelst
|
162ef04c41
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
Gero Gerke
|
6bebc623f9
|
UI polish
|
3 years ago |
|
Gero Gerke
|
34b86352f2
|
remove double spaces
|
3 years ago |
|
Gero Gerke
|
99e8a33118
|
escape room characters
|
3 years ago |
Gero Gerke
|
d7cc585101
|
Update server/notification-providers/matrix.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Gero Gerke
|
5decfb9fad
|
Matrix Notifications
|
3 years ago |
DeeJayPee
|
bc4db6c692
|
Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
|
3 years ago |
|
DeeJayPee
|
f14a798b2c
|
Fix indentation + typo
|
3 years ago |
|
Bert Verhelst
|
550825927c
|
Merge branch 'master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
edad2caf8e
|
return the correct exit code from jest
|
3 years ago |
|
LouisLam
|
49720c709c
|
improve the test with a single command only "npm test"
|
3 years ago |
|
Louis Lam
|
865b721b79
|
Merge pull request #519 from chakflying/improve-certInfo
Feat: Improve Certificate Info Display
|
3 years ago |
|
Bert Verhelst
|
6b44116245
|
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
|
3 years ago |
|
LouisLam
|
a2a4c70cf5
|
setup jest-puppeteer
|
3 years ago |
|
Bert Verhelst
|
3f0b85e5a8
|
feat(http-requests): add support for methods, body and headers for http
|
3 years ago |
Nelson Chan
|
13bdfefa9d
|
Feat: Improve Certificaet Info Display
|
3 years ago |
|
LouisLam
|
7fa1cb83af
|
[push type] add ping parameter
|
3 years ago |
|
LouisLam
|
8d5eaaf8a7
|
minor
|
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 |
|
LouisLam
|
6eceb4c744
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
LouisLam
|
3e4154dfb5
|
Fix retry interval affected bug
|
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 |
|
Ponkhy
|
4786514e9f
|
Merge branch 'louislam:master' into import-export
|
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 |
Adam Stachowicz
|
f6a984b671
|
start-server-dev. Fixes #460
|
3 years ago |
|
LouisLam
|
23a63213aa
|
Merge branch 'master' into import-export
# Conflicts:
# server/server.js
|
3 years ago |
|
LouisLam
|
0a5a6e6a4b
|
[status page] fix monitor order
|
3 years ago |
|
LouisLam
|
fe0fc63843
|
[status page] send uptime
|
3 years ago |
|
LouisLam
|
8c7ee94769
|
add modified apicache library with disabling client cache
|
3 years ago |
|
LouisLam
|
15c00d9158
|
upload logo and expose ./data/upload to url
|
3 years ago |
|
LouisLam
|
469e8f6fd6
|
Merge branch 'master' into public-dashboard
# Conflicts:
# package-lock.json
|
3 years ago |
|
LouisLam
|
4591adc05e
|
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
|
3 years ago |
|
LouisLam
|
5f6aa32844
|
fix store/fetch status page config
|
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 |
|
LouisLam
|
0b572df3d0
|
[status page] store config
|
3 years ago |
|
LouisLam
|
7ee98d989c
|
[status page] implement rest api for heartbeat
|
3 years ago |
|
LouisLam
|
fd95d41d9f
|
[status page] many update and save group list
|
3 years ago |
|
Louis
|
a6fdd272a6
|
[status page] minor
|
3 years ago |
|
Ponkhy
|
1b5e723f60
|
Added descriptions to uploadBackup function
|
3 years ago |
|
Ponkhy
|
4bdada36a9
|
Removed if includes version
|
3 years ago |
|
LouisLam
|
9b8f01cfc6
|
since eslint can auto fix semicolon, standardize all end with semicolon
|
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
|
e8f4fabcd0
|
[status page] crop and resize logo
|
3 years ago |
|
LouisLam
|
2ab06f87b8
|
Merge branch 'master' into public-dashboard
|
3 years ago |
|
Louis Lam
|
76db55b657
|
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
Add microsoft teams notification provider
|
3 years ago |
|
LouisLam
|
1693873f4a
|
[Teams] change handleTestNotification to GeneralNotification
|
3 years ago |
|
LouisLam
|
db05b506f3
|
[status page] checkpoint
|
3 years ago |
No0Vad
|
1300448bed
|
Adjustments to the retry interval
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
|
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
|
afe91078c4
|
[status page] checkpoint
|
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 |
Willian Rodrigues Barbosa
|
ccb8736b3d
|
fix: send msg if heartbeat message is not set
|
3 years ago |
|
Louis Lam
|
2c02dad1f9
|
Merge pull request #393 from Revyn112/master
add possibility to have a prefixMessage in discord notification before the embed
|
3 years ago |
|
DeeJayPee
|
29d0db805d
|
Add legacy octopush (Octopush-DM from 2011 to 2020 accounts) version
|
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
|
2617e1f4d8
|
Update database.js
|
3 years ago |
|
No0Vad
|
91ee39ec60
|
Merge branch 'master' into retry-heartbeat-interval
|
3 years ago |
|
LouisLam
|
e205adfd7b
|
[status page] developing
|
3 years ago |
|
Willian Rodrigues Barbosa
|
063d64eec8
|
feat: add microsoft teams notification provider
|
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 |
Denis Freund
|
8352d9abbe
|
add posibility to have a prefixMessage before the embed
|
3 years ago |
|
No0Vad
|
389d247463
|
Update server/database.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
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
|
295ccba44b
|
Adjusted for new db patch management
|
3 years ago |
|
Ponkhy
|
8cd5bad44c
|
Merge branch 'master' into 2fa
|
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 |
|
LouisLam
|
08de0090dc
|
add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
|
3 years ago |
|
Ponkhy
|
59cccf8c50
|
Fixed typo
|
3 years ago |
