Commit graph

2653 commits

Author SHA1 Message Date
Louis Lam
d344914ca0
Update docker-compose.yml 2022-05-09 13:47:19 +08:00
Louis Lam
e488e2dc0a
Merge pull request #1119 from jensneuber/uptime-badges
Add badges
2022-05-07 13:44:20 +08:00
Louis Lam
4e3258579d Merge branch 'master' into uptime-badges
# Conflicts:
#	server/util-server.js
2022-05-07 13:26:47 +08:00
MrEddX
aa8ea6d398
Update bg-BG.js (#1617)
Translation Fixes
2022-05-07 13:01:06 +08:00
Louis Lam
8b0813ceff Fix #1596 hopefully 2022-05-06 14:52:09 +08:00
Louis Lam
91178ce6a5 Merge remote-tracking branch 'origin/master' 2022-05-06 14:41:46 +08:00
Louis Lam
429ad384d0 Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog() 2022-05-06 14:41:34 +08:00
Louis Lam
4c2753af46 Remove an unused variable 2022-05-02 13:36:35 +08:00
Louis Lam
c6ba5b621c Remove isPublished, checkPublished which had been removed in upstream. 2022-05-02 13:32:19 +08:00
Louis Lam
96536ae391 Rebuild package-lock.json 2022-05-02 12:36:12 +08:00
Louis Lam
ba46544772
Merge pull request #1603 from Saibamen/fix_task_name
Fix actions/setup-node task name
2022-05-02 12:35:21 +08:00
Adam Stachowicz
5c852db1cf Fix actions/setup-node task name
Addendum to 000cbeb0ce
2022-05-02 01:23:05 +02:00
Louis Lam
15820c6937 Update SQLite 2022-05-01 19:45:00 +08:00
Louis Lam
000cbeb0ce Lower check-linters node version to 14, add Node.js 18, set timeout 15mins for each job 2022-05-01 18:25:52 +08:00
Louis Lam
e118d59ac8 Merge branch 'master' into uptime-badges 2022-05-01 18:01:26 +08:00
Louis Lam
39aa0a7f07 Merge branch 'fix/chart-error' 2022-05-01 17:57:17 +08:00
Louis Lam
a12dffd1bc Fallback to eqeq for PingChart.vue 2022-05-01 17:56:42 +08:00
Louis Lam
410805052e Log this.chartPeriodHrs 2022-05-01 17:46:43 +08:00
Louis Lam
02a8147f22 Remove undefined variable forceShowContent 2022-05-01 17:31:58 +08:00
Louis Lam
d962ab7a1c Merge branch 'master' into uptime-badges
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
2022-05-01 17:03:11 +08:00
Louis Lam
63c8d24d6f As legacy-peer-deps is specified in .npmrc, install-legacy and update-legacy are not actually needed. 2022-05-01 12:32:06 +08:00
Louis Lam
254a6bfd36 [CI] Run check linters first 2022-05-01 12:23:28 +08:00
Louis Lam
29f3cbe8c6
Merge pull request #1594 from GOGOsu/patch-1
Fix aliyun-sms "SignatureDoesNotMatch" Error
2022-05-01 12:14:09 +08:00
Louis Lam
53b98ad3e4 Add more comment for aliyun-sms fix 2022-05-01 12:10:47 +08:00
Louis Lam
dbd7c087e0
Merge pull request #1597 from chakflying/fix/chart-error
Fix: Fix chart error on switch back to recent
2022-05-01 11:09:57 +08:00
Nelson Chan
272956025c Fix: Fix chart error on switch back to recent 2022-05-01 05:18:08 +08:00
Louis Lam
db50ba91cc Fix #1593 2022-04-30 21:44:03 +08:00
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
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
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
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
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