Louis Lam
511038b45a
Remove unused code
2023-04-01 04:22:10 +08:00
Louis Lam
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
2023-04-01 00:58:23 +08:00
Louis Lam
02291730fe
WIP
2023-03-31 04:04:17 +08:00
Louis Lam
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-03-12 18:38:19 +08:00
Louis Lam
958354e4db
Minor
2023-02-28 16:58:36 +08:00
Louis Lam
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2023-02-28 16:55:50 +08:00
Louis Lam
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
2023-02-25 19:14:44 +08:00
Louis Lam
d668812df1
Fix merge issue
2023-02-25 17:59:25 +08:00
Louis Lam
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
Louis Lam
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2023-02-25 00:06:25 +08:00
Faruk Genç
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-18 22:38:40 +03:00
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
Matthew Nickson
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>
2023-02-15 00:43:40 +08:00
Suriya Soutmun
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2023-02-07 09:40:44 +07:00
Faruk Genç
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
2023-02-05 18:19:46 +03:00
c
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
Faruk Genç
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
Faruk Genç
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2023-01-25 20:20:11 +03:00
Louis Lam
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2023-01-25 16:12:33 +08:00
Faruk Genç
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
2023-01-14 16:40:13 +03:00
Matthew Nickson
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-09 20:20:09 +00:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
Louis Lam
50711391d1
Revert "Auth: Case insensitive login check on username"
2023-01-01 22:19:00 +08:00
Mathias Haugsbø
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2022-12-19 12:18:33 +01:00
Louis Lam
bc86f8bb5f
Reset busy_timeout to default
2022-12-11 20:25:15 +08:00
minhhn3
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-10-22 16:22:28 +01:00
Louis Lam
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
Louis Lam
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
2022-09-17 16:12:57 +08:00
Justin Tisdale
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2022-08-20 10:24:18 -04:00
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-08-13 21:15:16 +02:00
minhhn3
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
Louis Lam
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
Justin Tisdale
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04:00
Louis Lam
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
2022-08-11 21:08:06 +08:00
Louis Lam
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
Joseph Benguira
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
Joseph Benguira
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
Joseph Benguira
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
2022-07-31 18:51:53 +03:00
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
Matthew Nickson
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>
2022-07-14 08:32:51 +01:00
Louis Lam
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
Louis Lam
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2022-06-28 22:11:59 +08:00
