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 |
|
LouisLam
|
23a2d33f8c
|
[backup] restore pushToken
|
3 years ago |
|
LouisLam
|
a15e9077fc
|
[status page] clear cache if it is an important beat
|
3 years ago |
|
LouisLam
|
fc8d1e78b6
|
[push type] hide upside down mode, apply primary base url
|
3 years ago |
Lukas
|
db791c880a
|
Don't use then with await.
|
3 years ago |
|
Lukas
|
dfd63386ba
|
Make PromoSMS actually working
Make PromoSMS actually working and inform on success only when API return 0
|
3 years ago |
Lukas
|
12b5489eb5
|
PromoSMS as Notification Provider
Add PromoSMS (Polish SMS Gateway) as new notification provider
|
3 years ago |
|
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 |
|
LouisLam
|
e5f6d7f047
|
slack and rocket.chat use the primary base url
env var to show time logger
|
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 |
|
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 |
|
LouisLam
|
a2a4c70cf5
|
setup jest-puppeteer
|
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 |
