Commit graph

3490 commits

Author SHA1 Message Date
Louis Lam 42ea3fb412
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:07 +08:00
Louis Lam 9f8b3151d8
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:00 +08:00
Karel Krýda 57368c8c6c More modern look of maintenance information on status page (same design as for the new incident system) 2022-04-30 15:32:56 +02:00
Karel Krýda 11ef22edec Fixed remaining lint errors 2022-04-30 15:13:13 +02:00
GOGOsu 73e38a13d2
Update server/notification-providers/aliyun-sms.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-30 21:08:35 +08:00
Karel Krýda f78d01d770 Resolve lint errors 2022-04-30 14:57:08 +02:00
Karel Krýda 7532acc95d Resolve conflicts 2022-04-30 14:33:54 +02:00
Greg Smith f4515ad8c5 add axios cached dns resolve to monitor 2022-04-30 21:40:47 +09:30
Karel Krýda ed84e56a85 Merge remote-tracking branch 'origin_kuma/master'
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/MonitorList.vue
#	src/components/PingChart.vue
#	src/icon.js
#	src/pages/DashboardHome.vue
#	src/pages/StatusPage.vue
#	src/router.js
#	src/util.js
2022-04-30 13:40:34 +02:00
GOGOsu 369477b4b9
Update aliyun-sms.js 2022-04-30 10:45:38 +08:00
GOGOsu 2347a01f7c
Update aliyun-sms.js
Add comments for the changed code.
2022-04-30 10:42:59 +08:00
Adam Stachowicz c114c053d6 Fix ESLint warnings and errors 2022-04-30 03:51:14 +02:00
GOGOsu ae2c49a729
Update aliyun-sms.js 2022-04-30 06:28:16 +08:00
GOGOsu b9e72b9645
Update aliyun-sms.js
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
2022-04-30 05:56:10 +08:00
AnnAngela 5a069b278d
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-29 21:42:54 +08:00
AnnAngela 65ea2e6aeb
Update src/components/notifications/PromoSMS.vue
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-29 21:42:48 +08:00
AnnAngela-work e82fc1df61 Match up en lang file 2022-04-29 20:31:36 +08:00
AnnAngela-work 7dd5f5ea0d Improve translation 2022-04-29 20:26:56 +08:00
AnnAngela-work 45da7c5431 Improve translation work 2022-04-29 20:17:15 +08:00
Louis Lam 26230a3d3a Update to 1.15.1 2022-04-29 13:52:14 +08:00
Louis Lam 82aa52b330 Update Apprise to 0.9.8.3 2022-04-29 13:49:32 +08:00
Louis Lam fa7d15cf64 Merge remote-tracking branch 'origin/master' 2022-04-29 13:40:17 +08:00
Louis Lam d7f16908d8 Update CONTRIBUTING.md 2022-04-29 13:39:30 +08:00
Louis Lam bddd5de22b
Update CONTRIBUTING.md 2022-04-29 11:35:03 +08:00
Louis Lam 6333231f1b
Merge pull request #1108 from trogper/push-status-param
Add status parameter to push monitor
2022-04-29 00:12:44 +08:00
Louis Lam 60538036c6 [#1108] Change "true" to "up" 2022-04-28 23:44:08 +08:00
Louis Lam 0ba5d031d0 Merge branch 'master' into push-status-param
# Conflicts:
#	server/routers/api-router.js
2022-04-28 23:34:51 +08:00
Louis Lam 66e4c89897
Merge pull request #1560 from MrEddX/bulgarian
Update bg-BG.js
2022-04-28 23:23:09 +08:00
Louis Lam d210548ae8
Merge pull request #1581 from NixNotCastey/update-pl
Update polish translation
2022-04-28 23:22:31 +08:00
Louis Lam 023db1450d Fix #1577 2022-04-28 23:12:16 +08:00
Louis Lam 824c16a07c
Merge pull request #1578 from kadavr95/typos-fixes
Typos fixes
2022-04-28 17:27:22 +08:00
Łukasz Szczepański 09fdef9bdc Update polish translation 2022-04-28 11:14:02 +02:00
Dmitry Yaskovich 7078b06272
Fix typo in Russian localization 2022-04-27 21:22:42 +03:00
Dmitry Yaskovich d3bd2976c5
Fix typo in CONTRIBUTING.md 2022-04-27 21:18:47 +03:00
Dmitry Yaskovich db646aa40b
Fix typo in README 2022-04-27 21:10:47 +03:00
Matthew Nickson 3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-27 18:26:11 +01:00
Louis Lam b50f1bb7e8 No more opening browser 2022-04-27 15:29:54 +08:00
Phuong Nguyen Minh a3baa3c149
Update language vi.js (#1572)
Update vi-VN.js
2022-04-27 15:07:42 +08:00
Louis Lam 2adb142ae2
Merge pull request #1571 from MarkusDick/update-german-translations
lang: update german translations
2022-04-27 15:04:04 +08:00
Louis Lam 752415dae6
Merge pull request #1566 from Saibamen/fix_duplicated_PR_comments
Fix duplicated PR comments
2022-04-27 15:01:52 +08:00
Louis Lam 1687de163c
Merge pull request #1565 from Saibamen/eslint
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
Louis Lam 245b13d3c8
Merge pull request #1542 from Computroniks/jsdoc-for-tests
JSDoc for test/*
2022-04-27 14:48:46 +08:00
Louis Lam d6c3fdb6fb
Merge pull request #1499 from Computroniks/add-JSDoc-comments
Add JSDoc comments for server/*/*
2022-04-27 14:46:23 +08:00
MrEddX 372bf57e9f
Update bg-BG.js
Translation fixes
2022-04-27 09:19:13 +03:00
Aram Akhavan 39df4eea92 Ssynchronize push monitor heartbeats to api calls
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
MrEddX 03e6f0a6c8
Update bg-BG.js
Translation fixes.
2022-04-26 21:39:14 +03:00
Markus Dick dcec53a755 lang: update german translations 2022-04-26 20:27:00 +02:00
MrEddX ce17ed163e
Merge branch 'louislam:master' into bulgarian 2022-04-26 21:26:39 +03:00
Adam Stachowicz 3019d5dd64 Shorter node matrix 2022-04-26 02:03:47 +02:00
Adam Stachowicz dcdbb7be8b Use separate job for linters 2022-04-26 01:57:49 +02:00