Commit graph

2683 commits

Author SHA1 Message Date
Louis Lam 8ede6d888f Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url 2022-05-14 14:37:12 +08:00
Louis Lam cec0521834 [Discord] Fix ping type should no port, update better naming 2022-05-14 14:36:40 +08:00
Louis Lam 73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
Fixed incorrect uptime calculation for push monitors
2022-05-14 14:18:19 +08:00
Louis Lam 92a43e1f30 Make the sibling beats a bit smaller 2022-05-14 14:11:43 +08:00
Louis Lam 0cf395dfc3 Fix merge issue 2022-05-14 14:06:35 +08:00
Louis Lam 749ca6f4a8 Merge remote-tracking branch 'origin/master' into feature-improve-status-styling
# Conflicts:
#	src/components/HeartbeatBar.vue
#	src/components/PublicGroupList.vue
2022-05-14 14:05:28 +08:00
Louis Lam 66971deaf4 Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url 2022-05-11 00:51:42 +08:00
Louis Lam 8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
Fix apprise integration for Zulip Streams
2022-05-11 00:47:50 +08:00
Jordan Bertasso c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url 2022-05-10 22:53:55 +10:00
Karel Krýda 7da9f139c1 Bug fix 2022-05-09 21:10:12 +02:00
Karel Krýda 7acbfd2474 eslint fixes too much 2022-05-09 21:05:10 +02:00
Karel Krýda 9f493bbec7 clone master branch 2022-05-09 21:02:29 +02:00
Louis Lam 5bf58cc6c4
Merge pull request #1595 from Saibamen/fix_eslint
Fix ESLint warnings and errors
2022-05-09 13:55:08 +08:00
Louis Lam d344914ca0
Update docker-compose.yml 2022-05-09 13:47:19 +08:00
Clemens Wolff b680371746 Make apprise notification title configurable in UI 2022-05-07 11:00:57 -04: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
Clemens Wolff 4b9dc2890d Convert let to const 2022-05-02 11:16:08 -04:00
Clemens Wolff f9004bcbed Add optional title to apprise notification 2022-05-02 11:14:26 -04:00
Clemens Wolff bc174c3325 Extract child process args into variable 2022-05-02 11:00:14 -04: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
Adam Stachowicz 069d3765f0 Revert change for StatusPage 2022-05-02 01:13:17 +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