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 |
|
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 |
|
LouisLam
|
e330875c80
|
fix restore fail if no isDefault
|
3 years ago |
|
Louis Lam
|
331ae5ec20
|
Merge pull request #306 from Ponkhy/import-export
Added import and export function
|
3 years ago |
|
LouisLam
|
8ee34c7904
|
also handle the first beat problem in uptime
|
3 years ago |
|
LouisLam
|
4f07c2ea9a
|
uptime calculation fully sum in sql
|
3 years ago |
|
LouisLam
|
24facc79d7
|
sendHeartbeatList use raw data
|
3 years ago |
|
LouisLam
|
9f9c1007d7
|
increase sqlite cache size from 2MB to 12MB
|
3 years ago |
|
LouisLam
|
dd283423ab
|
improve smtp with cc, bbc and ignore tls
|
3 years ago |
|
LouisLam
|
6006038689
|
fix monitor.stop() in some cases
|
3 years ago |
|
LouisLam
|
a7b50c3630
|
Revert "add user-monitor-list"
This reverts commit 230a9bfaf9.
|
3 years ago |
|
LouisLam
|
0ddbac5109
|
Revert "move userMonitorList out of server.js"
This reverts commit a7cf14c663.
|
3 years ago |
|
LouisLam
|
0f440596c8
|
Revert "cache last heartbeat list in memory"
This reverts commit 87678ea92d.
|
3 years ago |
|
LouisLam
|
87678ea92d
|
cache last heartbeat list in memory
|
3 years ago |
|
LouisLam
|
a7cf14c663
|
move userMonitorList out of server.js
|
3 years ago |
|
LouisLam
|
230a9bfaf9
|
add user-monitor-list
|
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
|
0aeaf87f5b
|
Merge branch 'master' into default-notification
# Conflicts:
# server/notification.js
# src/components/NotificationDialog.vue
|
3 years ago |
|
LouisLam
|
da74391c3e
|
convert notifications into modules
|
3 years ago |
Ponkhy
|
242e494cb5
|
Merge branch 'master' into import-export
|
3 years ago |
|
Ponkhy
|
4faa409027
|
Merge branch 'master' into default-notification
|
3 years ago |
|
LouisLam
|
da131a5156
|
Merge branch 'master' into clear-monitor-data
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
|
3 years ago |
|
Ponkhy
|
fd8c95d64e
|
Merge branch 'master' into default-notification
|
3 years ago |
|
Ponkhy
|
58240aceef
|
Added the option for default notifications
|
3 years ago |
|
Louis Lam
|
f9c177b150
|
Merge pull request #315 from tgxn/patch-1
Notifications Content Improvements: SMTP, LunaSea, PushBullet
|
3 years ago |
|
LouisLam
|
299506ce45
|
reset the heartbeat list instead of reload the page after cleared events or heartbeats
|
3 years ago |
Domenic Horner
|
41d32bb9dd
|
Undo parm changes
|
3 years ago |
|
Domenic Horner
|
b0acda52f9
|
Add time to smtp body content
|
3 years ago |
|
Domenic Horner
|
e9cd9be03a
|
Use constants for UP/DOWN through notifications class
|
3 years ago |
|
Domenic Horner
|
6ae279c7f3
|
Move title generation to notification class
|
3 years ago |
|
Domenic Horner
|
9c32adfb55
|
Update pushbullet down body
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Domenic Horner
|
d346afd33b
|
Update pushbullet up body
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Domenic Horner
|
3bf380c684
|
Update lunasea "up" body content
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Domenic Horner
|
dca5c59982
|
Update lunasea body content
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
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 |
|
LouisLam
|
b1647a310e
|
add demo db
|
3 years ago |
|
Ponkhy
|
7d70c4d8cd
|
Code optimizations
|
3 years ago |
|
Domenic Horner
|
532ad3044c
|
Add space to pushbullet and lunasea notifications
Start changes regarding standardization of notification messages
|
3 years ago |
|
LouisLam
|
f23ecef636
|
add missing cert parameters
|
3 years ago |
|
LouisLam
|
51cf2ff6f9
|
add missing cert parameters
|
3 years ago |
|
LouisLam
|
b30b1d3a52
|
create data dir before copy
|
3 years ago |
|
LouisLam
|
582e14098d
|
create data dir before copy
|
3 years ago |
|
LouisLam
|
6e3e2fc85c
|
fix db path
|
3 years ago |
|
LouisLam
|
b604807cfe
|
create data dir if not exists
|
3 years ago |
|
LouisLam
|
3ee13bddd1
|
dash style for args
|
3 years ago |
|
LouisLam
|
c74986647e
|
allow changing data dir
|
3 years ago |
|
LouisLam
|
b88b357b55
|
add support for https
|
3 years ago |
|
Ponkhy
|
2dd392e609
|
Added uptime kuma version to backup file
|
3 years ago |
|
Ponkhy
|
c13cc62d3d
|
Update server/server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Ponkhy
|
b604910bbb
|
Merge branch 'master' into clear-monitor-data
|
3 years ago |
|
Ponkhy
|
2f6c5963c5
|
Added import and export function
|
3 years ago |
|
LouisLam
|
e4b76717be
|
revert back to node-sqlite3
|
3 years ago |
|
LouisLam
|
cd1a3a2fb9
|
revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems
|
3 years ago |
|
Ponkhy
|
7b92166d18
|
Added clear all db statistics function
|
3 years ago |
|
Ponkhy
|
1341d220ed
|
Merge branch 'louislam:master' into clear-monitor-data
|
3 years ago |
|
LouisLam
|
697fa6bdfd
|
fix discord notification appended port unexpectedly
|
3 years ago |
|
LouisLam
|
527e0c3444
|
raise the ping timeout from 2s to 10s (avoid #294)
|
3 years ago |
|
LouisLam
|
a41534ca60
|
no declare vars with comma, one line only one statement
|
3 years ago |
|
LouisLam
|
ec731d174d
|
Merge branch 'MichelBaie_master'
|
3 years ago |
|
LouisLam
|
0d65918a6a
|
change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt
|
3 years ago |
|
LouisLam
|
bf29f28726
|
send stats only if there is at least one client in the room
|
3 years ago |
|
Ponkhy
|
1952e34110
|
Added the possibility to clear monitor data
|
3 years ago |
|
LouisLam
|
ada6606217
|
move the new sql to patch8.sql
|
3 years ago |
|
Ponkhy
|
858affa808
|
Removed useless database query
|
3 years ago |
|
Ponkhy
|
303adbf9b1
|
Show latest dns result in Details.vue
|
3 years ago |
|
Louis Lam
|
7652b4849a
|
Merge pull request #238 from Ponkhy/dns-monitor
Added DNS Monitor Type
|
3 years ago |
|
Louis Lam
|
d2f0a15076
|
Merge pull request #264 from antiseptikk/master
feat: add rocket.chat notification
|
3 years ago |
Thomas Ferney
|
44d9967cfb
|
feat: add rocket.chat notification
|
3 years ago |
|
LouisLam
|
46ac753c46
|
Merge branch 'master' into dns-monitor
|
3 years ago |
Thies
|
72740ba477
|
Update the styling to better match existing styles
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
Thies Nieborg
|
5d438ca2b6
|
Discord notification URL now also represents non http services
|
3 years ago |
|
Ponkhy
|
d313a06d5c
|
Optimizations for output handling
|
3 years ago |
Rashad
|
23851ef539
|
added mattermost notification support
|
3 years ago |
|
LouisLam
|
397fd12081
|
remove unused import
|
3 years ago |
|
LouisLam
|
682e4d45e2
|
eslint for notification.js
|
3 years ago |
