Louis Lam
7276f34d90
fix reset-password
2021-10-16 00:57:26 +08:00
Louis Lam
4178983df3
Merge remote-tracking branch 'origin/master'
2021-10-15 19:01:04 +08:00
Louis Lam
cd211a6be7
[http options] fine tune
2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
2021-10-15 00:54:31 +08:00
Louis Lam
c9b4d2ae2a
Merge pull request #698 from erktime/master
...
Add monitor name context to Slack fallback text.
2021-10-14 23:31:48 +08:00
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
2021-10-14 22:32:15 +08:00
Louis Lam
a7d2a34dae
fix ping bug
2021-10-14 18:48:40 +08:00
Louis Lam
60acb91fc8
Merge pull request #687 from xjoker/master
...
Add new notification `Aliyun Sms` and `DingDing`
2021-10-14 17:02:23 +08:00
Louis Lam
f51156f18e
run eslint for #687
2021-10-14 16:24:03 +08:00
Louis Lam
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
2021-10-14 16:07:25 +08:00
Louis Lam
674b387c95
Merge branch 'master' into smtp-subject
2021-10-14 14:59:54 +08:00
Louis Lam
5ff9a64e5e
[Push Type] Fix missing duration calculation ( #685 )
2021-10-14 14:42:34 +08:00
Louis Lam
4bee57ea7f
Merge remote-tracking branch 'giacomo892/patch-1'
...
# Conflicts:
# server/ping-lite.js
2021-10-14 14:10:51 +08:00
Louis Lam
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
2021-10-14 14:09:16 +08:00
xJoker
6e04ec436e
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:45 +08:00
xJoker
2d471a5e84
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:33 +08:00
xJoker
cae194f58f
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:24 +08:00
Aaron Erkenswick
655ccc86b9
Add monitor name context to Slack fallback text.
...
The text block of a slack notification payload is used for mobile
devices and plain text previews. This change allows slack users to see
the name of the failing service without having to open up Slack to read
the entire message.
2021-10-13 11:47:23 -07:00
Louis Lam
e2dbacb383
Fix encoding problem of ping result for non-English Windows
2021-10-14 00:22:49 +08:00
Lukas
89b34b5748
Use double curly brackets and sanity check for customSubject
2021-10-13 18:05:18 +02:00
wuwenjing
843992c410
Add DingDing notification
2021-10-13 16:13:46 +08:00
wuwenjing
57a76e6129
remove alicloud/pop-core keep simple
2021-10-13 14:41:59 +08:00
giacomo892
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 08:29:55 +02:00
Lukas
330cd6e058
Minor rehabilitanty impedyment
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 07:32:09 +02:00
wuwenjing
a2f2253221
Add aliyun sms notification
2021-10-13 11:55:01 +08:00
Lukas
30d8aadf12
Slightly refactor
2021-10-12 23:24:34 +02:00
giacomo892
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
2021-10-12 19:37:58 +02:00
Nelson Chan
03b07730d3
Fix: Increase default kept period
2021-10-12 23:28:21 +08:00
Andreas Brett
2538bd04ce
notp verification defaults
2021-10-11 20:18:40 +02:00
xJoker
1bc77a06e5
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:32 +08:00
xJoker
69c623ac2b
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:19 +08:00
wuwenjing
ce2df137e6
change text to using variable msg
2021-10-11 17:53:13 +08:00
wuwenjing
6d9b71c054
Add Feishu notification
2021-10-11 17:20:09 +08:00
Andreas Brett
e223e826a3
linting
2021-10-11 01:02:54 +02:00
Andreas Brett
b5b391c73b
avoid default values for token verification
...
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640 )
2021-10-10 22:13:18 +02:00
Bert Verhelst
5445c2a2ff
fix(monitor): revert unintentional change to comment
2021-10-10 18:41:29 +02:00
Bert Verhelst
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
2021-10-10 18:40:53 +02:00
Louis
2286f78f57
update to 1.8.0
2021-10-10 16:37:53 +08:00
LouisLam
82131f4dd2
merge conflict
2021-10-10 13:09:30 +08:00
Bert Verhelst
5137c80c07
fix(monitor): handle empty headers
2021-10-09 21:51:24 +02:00
Lukas
792f3c7c5c
Add support for values of Name, Hostname and Status
2021-10-09 21:48:28 +02:00
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject
2021-10-09 20:37:12 +02:00
LouisLam
56ae6f6117
fix demoMode export
2021-10-10 02:36:20 +08:00
Lukas
5e3ea3293c
Very basic email subject customization
2021-10-09 20:32:45 +02:00
LouisLam
5c89562650
not allow lower than 20s for demo mode
2021-10-10 02:23:27 +08:00
Nelson Chan
ac80631bcd
Fix: Run clear data at specific time
2021-10-10 00:16:29 +08:00
Nelson Chan
8caf47988c
Fix: Allow setting settings type
2021-10-10 00:16:13 +08:00
Nelson Chan
dca5a59dbc
Feat: Implement data clearing logic & frontend
2021-10-09 23:33:47 +08:00
Nelson Chan
656a4d6270
WIP: Enable background jobs
...
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
2021-10-09 12:42:32 +02:00
Bert Verhelst
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-09 12:35:08 +02:00
LouisLam
23a2d33f8c
[backup] restore pushToken
2021-10-09 17:45:05 +08:00
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
LouisLam
a15e9077fc
[status page] clear cache if it is an important beat
2021-10-09 17:04:51 +08:00
LouisLam
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
2021-10-08 20:03:52 +08:00
Lukas
db791c880a
Don't use then with await.
2021-10-08 11:49:12 +02:00
Lukas
dfd63386ba
Make PromoSMS actually working
...
Make PromoSMS actually working and inform on success only when API return 0
2021-10-08 09:11:13 +02:00
Lukas
12b5489eb5
PromoSMS as Notification Provider
...
Add PromoSMS (Polish SMS Gateway) as new notification provider
2021-10-07 21:56:32 +02:00
LouisLam
ddad2dcb4a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/languages/en.js
2021-10-08 01:40:34 +08:00
LouisLam
5b4af550fb
Merge branch 'master' into DeeJayPee_master
2021-10-08 01:27:06 +08:00
LouisLam
3a0143ac46
[matrix] use encodeURIComponent to handle the url encode
2021-10-08 01:11:33 +08:00
LouisLam
2ce5c28ed4
Merge branch 'master' into feature/matrix-notifications
...
# Conflicts:
# src/languages/en.js
2021-10-08 00:59:39 +08:00
Bert Verhelst
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-07 18:22:59 +02:00
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
2021-10-07 17:39:58 +08:00
Bert Verhelst
162ef04c41
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-06 21:56:28 +02:00
Gero Gerke
6bebc623f9
UI polish
2021-10-05 21:59:58 +02:00
Gero Gerke
34b86352f2
remove double spaces
2021-10-05 21:40:59 +02:00
Gero Gerke
99e8a33118
escape room characters
2021-10-05 21:36:01 +02:00
Gero Gerke
d7cc585101
Update server/notification-providers/matrix.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-05 20:42:44 +02:00
Gero Gerke
5decfb9fad
Matrix Notifications
2021-10-05 20:03:56 +02:00
DeeJayPee
bc4db6c692
Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
2021-10-05 19:57:27 +02:00
DeeJayPee
f14a798b2c
Fix indentation + typo
2021-10-05 19:43:04 +02:00
Bert Verhelst
550825927c
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-05 18:19:07 +02:00
LouisLam
edad2caf8e
return the correct exit code from jest
2021-10-05 20:40:40 +08:00
LouisLam
49720c709c
improve the test with a single command only "npm test"
2021-10-05 19:13:57 +08:00
Louis Lam
865b721b79
Merge pull request #519 from chakflying/improve-certInfo
...
Feat: Improve Certificate Info Display
2021-10-05 16:09:08 +08:00
Bert Verhelst
6b44116245
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-05 08:54:40 +02:00
LouisLam
a2a4c70cf5
setup jest-puppeteer
2021-10-03 18:16:55 +08:00
Bert Verhelst
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
Nelson Chan
13bdfefa9d
Feat: Improve Certificaet Info Display
2021-10-01 18:56:28 +08:00
LouisLam
7fa1cb83af
[push type] add ping parameter
2021-10-01 16:43:11 +08:00
LouisLam
8d5eaaf8a7
minor
2021-10-01 00:26:27 +08:00
LouisLam
b246c8e0f2
Fix 2fa for iOS Google authenticator ( #486 )
2021-10-01 00:23:18 +08:00
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
LouisLam
6eceb4c744
Merge remote-tracking branch 'origin/master'
2021-09-29 17:20:58 +08:00
LouisLam
3e4154dfb5
Fix retry interval affected bug
2021-09-29 17:20:35 +08:00
Louis Lam
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
...
Fix: clear important beats after deleteMonitor
2021-09-29 15:39:57 +08:00
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
LouisLam
0afa3a2c21
Merge branch '1.6.X'
...
# Conflicts:
# server/database.js
# server/server.js
2021-09-24 19:12:57 +08:00
Nelson Chan
662c97dcde
Fix: Fix importing tag if tag doesn't exist
2021-09-24 14:34:53 +08:00
Ponkhy
7fb55b8875
Fixed issues
2021-09-23 17:31:01 +02:00
Ponkhy
4786514e9f
Merge branch 'louislam:master' into import-export
2021-09-23 17:24:53 +02:00
Nelson Chan
32c9dfbb31
Fix: clear important beats after deleteMonitor
2021-09-23 23:21:08 +08:00
Ponkhy
d3d4363031
Used compare-version instead of replace
2021-09-23 17:15:11 +02:00
Adam Stachowicz
f6a984b671
start-server-dev. Fixes #460
2021-09-23 12:45:30 +02:00
LouisLam
23a63213aa
Merge branch 'master' into import-export
...
# Conflicts:
# server/server.js
2021-09-23 17:20:13 +08:00
LouisLam
0a5a6e6a4b
[status page] fix monitor order
2021-09-22 15:23:58 +08:00
LouisLam
fe0fc63843
[status page] send uptime
2021-09-22 15:10:08 +08:00
LouisLam
8c7ee94769
add modified apicache library with disabling client cache
2021-09-22 00:58:22 +08:00
