minhhn3
3a90d246a4
fix: wrong type
2022-08-20 22:45:11 +07: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
31cc328839
fix lint
2022-08-11 21:08:13 -04: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
minhhn3
34ab6142db
fix: remove new space line
2022-08-08 19:38:43 +07:00
Louis Lam
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2022-08-08 17:04:08 +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
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2022-08-06 18:08: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
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
2022-08-03 13:39:31 +07: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
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-08-01 13:18:19 +03:00
Louis Lam
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com >
2022-08-01 15:42:58 +08: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
Louis Lam
2389b604fe
Use Settings.get
2022-07-31 23:41:29 +08:00
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2022-07-31 23:36:33 +08:00
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2022-07-31 23:27:35 +08:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
rmt/src
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2022-07-31 12:41:18 +01:00
Louis Lam
8ced61697a
Fix save docker host issue
2022-07-30 19:48:12 +08:00
Louis Lam
f3322398e5
Fix and improve test docker host
2022-07-29 20:57:13 +08:00
0x01code
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com >
2022-07-29 15:13:50 +08:00
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
c0derMo
fb3b407577
Added a settings page & localization
2022-07-24 12:34:43 +00:00
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2022-07-24 14:07:30 +08:00
c0derMo
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
Louis Lam
239611a016
Do not set sendUrl if sendUrl is undefined
2022-07-22 23:27:02 +08:00
Rolf Bachmann
c4a2ce4e78
Add authentication support for ntfy
2022-07-19 12:17:15 +02:00
tamasmagyar
a382f811f4
added comment to startE2eTests function
2022-07-18 20:51:17 +02:00
tamasmagyar
986c03aecd
test cypress run
2022-07-18 20:51:17 +02:00
Jan Hartje
af07c7f050
feat(notification): add Authorization Header option to backend
2022-07-18 16:04:27 +00:00
Louis Lam
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
Louis Lam
17ed051401
Add CacheableDnsHttpAgent.install()
2022-07-18 23:32:45 +08:00
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2022-07-18 23:25:14 +08:00
Louis Lam
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2022-07-18 23:14:16 +08:00
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
Louis Lam
25d711e683
Fix jsdoc data type
2022-07-18 22:06:25 +08:00
Matthew Nickson
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com >
2022-07-14 09:19:40 +01: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
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2022-07-12 22:59:23 -04:00
