511038b45a
Remove unused code
1 year ago
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
1 year ago
02291730fe
WIP
1 year ago
ca52047bf5
Feat: Flush WAL on shutdown
1 year ago
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
958354e4db
Minor
1 year ago
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
1 year ago
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
1 year ago
d668812df1
Fix merge issue
1 year ago
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
1 year ago
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
cef0a0faf4
Merge branch 'master' into group-monitors
1 year ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
1 year ago
cd18b96f69
Added check to ensure backup exists when restoring ( #2779 )
...
A check to ensure that the backup database exists before deleting the
current database.
Fixes #2778
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
f2633a5d01
Finished knex_init_db.js
1 year ago
4056951915
WIP: building database in knex.js
1 year ago
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
1 year ago
db4663d6be
Merge remote-tracking branch 'origin/master' into 2.0.X
1 year ago
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
1 year ago
68ead3414d
WIP
1 year ago
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
1 year ago
dc4d2a77bb
WIP
1 year ago
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
1 year ago
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
1 year ago
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
1 year ago
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
97bd306a09
Merge branch 'louislam:master' into group-monitors
1 year ago
645fd94bba
feat: add ability to group monitors in dashboard
1 year ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
1 year ago
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
1 year ago
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
1 year ago
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
1 year ago
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
774d754b21
Add GameDig monitor
1 year ago
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
50711391d1
Revert "Auth: Case insensitive login check on username"
1 year ago
a4de93f976
WIP
1 year ago
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
1 year ago
bc86f8bb5f
Reset busy_timeout to default
1 year ago
b459408b10
fix: resolve conflict
2 years ago
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
39b6725163
Update maintenance tables
2 years ago
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2 years ago
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
2b9bf095a6
Add non-json support for http body
2 years ago
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
71d62ee151
removed ; after the PRAGMA command
2 years ago
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2 years ago
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2 years ago
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
a9f3142cee
Merge branch 'master' into master
2 years ago
ef73af391f
added option for ntlm authorization
2 years ago
87f933df4f
added sqlserver monitor
2 years ago
398ecb7666
add radius check
2 years ago
93050208bb
Merge database changes into single patch file
2 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2 years ago
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2 years ago
1e595eaa76
Update linters
2 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2 years ago
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
2 years ago
361e44ad6a
Merge branch 'louislam:master' into master
2 years ago
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
2 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2 years ago
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2 years ago
fee88b32e3
Set PRAGMA synchronous = FULL
2 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2 years ago
af44b0beab
Merge branch 'master' into master
2 years ago
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
2 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
2 years ago
28d72fcd08
Fix #1409 , slug cannot be empty
2 years ago
8d981c8f0b
[Status Page] Fix migration and unpin incident
2 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2 years ago
18ec42b060
[Status Page] wip
2 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
2 years ago
72ce28a541
Migrate status page table
2 years ago
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
2 years ago
Louis Lam
Nelson Chan
Faruk Genç
Peace
Matthew Nickson
Suriya Soutmun
c
Peace
Adam Spurgeon
Mathias Haugsbø
minhhn3
Justin Tisdale
Minh Hoàng
Joseph Benguira
Moritz R
OidaTiftla
Christopher Pickering
Christopher Pickering
Sascha Kruse
OidaTiftla
Karel Krýda
Adam Stachowicz
Uğur Erkan