Commit graph

401 commits

Author SHA1 Message Date
Bert Verhelst
495350b417 Merge branch 'master' into feature/monitor-checks 2021-10-10 18:44:50 +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
LouisLam
56ae6f6117 fix demoMode export 2021-10-10 02:36:20 +08:00
LouisLam
5c89562650 not allow lower than 20s for demo mode 2021-10-10 02:23:27 +08:00
LouisLam
23a2d33f8c [backup] restore pushToken 2021-10-09 17:45:05 +08:00
LouisLam
a15e9077fc [status page] clear cache if it is an important beat 2021-10-09 17:04:51 +08:00
Bert Verhelst
296ca50d5b fix(monitor): mark monitor as down when one check fails, up if no checks 2021-10-09 11:01:07 +02:00
Bert Verhelst
bb5f9a0dbd Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-09 10:47:59 +02: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
7cca4b19c6 Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-07 18:21:13 +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
eb810ec7c7 feat(monitor-checks): add should and should not dropdown 2021-10-06 21:45:53 +02:00
Bert Verhelst
786db6dada fix(monitor): if monitor checks fail do not set a ping 2021-10-06 20:23:25 +02:00
Bert Verhelst
8061bd8701 fix(monitor): correctly get deprecated values from checks list 2021-10-06 20:03:48 +02:00
Bert Verhelst
77c11a6a50
Update server/validate-monitor-checks.js
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2021-10-06 19:57:14 +02:00
Bert Verhelst
e2db15ce64 fix(monitor-checks): add deprecated fields for backward comp. 2021-10-06 12:57:19 +02:00
Bert Verhelst
b0d2084fda fix(monitor-checks): don't throw on 4xx errors 2021-10-06 11:58:43 +02:00
Bert Verhelst
c6a8d555cf Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-06 11:50:11 +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
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
Bert Verhelst
7d4928a26f Merge branch 'master' into feature/monitor-checks 2021-10-05 10:24:05 +02: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
cf8e643c0e Merge remote-tracking branch 'louislam/master' into feature/monitor-checks 2021-10-05 09:21:28 +02:00
LouisLam
a2a4c70cf5 setup jest-puppeteer 2021-10-03 18:16:55 +08:00
Nelson Chan
13bdfefa9d Feat: Improve Certificaet Info Display 2021-10-01 18:56:28 +08:00
Bert Verhelst
e20660adac fix(monitor-checks): do not export ids for monitor checks 2021-10-01 11:58:26 +02:00
Bert Verhelst
1a7b69d4aa fix(monitor-checks): use helper for saving monitor checks 2021-10-01 11:49:19 +02:00
Bert Verhelst
dc86117b2f fix(monitor-checks): fix json backup import 2021-10-01 11:31:20 +02:00
Bert Verhelst
a558b6140b Merge branch 'master' into feature/monitor-checks 2021-10-01 10:58:20 +02:00
Bert Verhelst
2c910885b8 feat(monitor-checks): ensure old exports are converted to the new format 2021-10-01 10:53:17 +02:00
LouisLam
7fa1cb83af [push type] add ping parameter 2021-10-01 16:43:11 +08:00
Bert Verhelst
70ac68368d Merge remote-tracking branch 'origin/master' into feature/monitor-checks 2021-10-01 09:08:00 +02: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