ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-28 01:04:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
3176 commits 30 branches 115 tags 68 MiB
Commit graph

910 commits

Author SHA1 Message Date
Louis Lam
3e85893bdd Merge remote-tracking branch 'origin/master' into squadcast-notification-support 
# Conflicts:
#	src/languages/en.js
 2022-10-03 16:16:50 +08:00
Louis Lam
543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support 
Add authentication support for ntfy
 2022-10-03 15:54:55 +08:00
Louis Lam
62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144 
Fixed octopush legacy doesn't return error code
 2022-10-03 15:53:54 +08:00
Louis Lam
0f99d49a27 Merge remote-tracking branch 'origin/master' into ntfy-auth-support 2022-10-03 15:30:00 +08:00
Louis Lam
d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field 
Fixed alert features unnecessary URL field #2009
 2022-10-03 15:20:45 +08:00
Matthew Nickson
6a3eccf6a6
Fixed alert features unnecessary URL field #2009 
The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-02 02:26:38 +01:00
Matthew Nickson
97de3959cd
Updated octopush error handling to accept 000 
The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 19:48:00 +01:00
Matthew Nickson
63e408f4f2
Fixed octopush legacy doesn't return error code 
The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 15:42:34 +01:00
Matthew Nickson
2e54dee817
Fixed Octopush Notifier not working #2144 
The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 15:03:28 +01:00
Patrick
bef9cb6a5f Linting fixes 2022-09-26 22:30:43 +13:00
Patrick
4157c7d546 Add support for Squadcast incoming webhook 2022-09-26 22:16:34 +13:00
MA Junyi
b03624b7e3 feat: Add ServerChan Notification support 2022-09-23 23:27:22 +08:00
Louis Lam
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager 
feat: Add support notification via SMSManager
 2022-09-16 14:29:50 +08:00
Super Manito
38c45a3fe3
Fix previously PR bug about Bark Notification (#2084) 
Co-authored-by: zuosc <zorro.zsc@hotmail.com>
 2022-09-16 14:21:22 +08:00
jakubenglicky
2d5096317f Fix warning at goalert.js 2022-09-15 09:11:27 +02:00
jakubenglicky
1c3da995e3 Add support notification via SMSManager 2022-09-15 09:11:05 +02:00
Louis Lam
197d44981f Merge remote-tracking branch 'origin/master' into test/add-cypress-tests 
# Conflicts:
#	package.json
 2022-09-09 16:32:23 +08:00
Louis Lam
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification 
Adding GoAlert Notification
 2022-09-09 03:34:37 +08:00
Louis Lam
84fad93555
Merge pull request #1735 from woooferz/patch-1 
Added label to status badge
 2022-08-29 21:19:15 +08:00
Muhammed Hussein karimi
a8ea76e8a1
Remove extra debug log 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-08-26 17:05:32 +04:30
Muhammed Hussein Karimi
584d52517a [Linter] fixing quotes with doublequote 2022-08-24 10:41:42 +04:30
Muhammed Hussein Karimi
82dd9a7c16 golaert req fix and axios update for formdata 2022-08-24 10:36:29 +04:30
Muhammed Hussein Karimi
d44663c57c provider name fix 2022-08-24 09:37:15 +04:30
Muhammed Hussein Karimi
e557545c97 goalert needs post instead of get 2022-08-24 08:46:20 +04:30
Muhammed Hussein Karimi
40b9d9ed17 goalert provider missing semicolon fix for linter 2022-08-23 22:26:20 +04:30
Muhammed Hussein Karimi
65e6921a41 goalert notification provider added 2022-08-23 22:22:54 +04:30
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
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
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
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