mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-01-07 11:57:48 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3303 commits 33 branches 117 tags 72 MiB
Commit graph

475 commits

Author SHA1 Message Date
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
Karel Krýda 42f931f6cf
Merge branch 'master' into master 2022-05-09 10:28:14 +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
Karel Krýda ed218e73bb UI improvements 2022-05-08 20:03:24 +02:00
Clemens Wolff b680371746 Make apprise notification title configurable in UI 2022-05-07 11:00:57 -04:00
Karel Krýda 2b14bdae62
Merge branch 'master' into master 2022-05-01 12:40:34 +02: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
Nelson Chan 272956025c Fix: Fix chart error on switch back to recent 2022-05-01 05:18:08 +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
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
Adam Stachowicz c114c053d6 Fix ESLint warnings and errors 2022-04-30 03:51:14 +02: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 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
Adam Stachowicz 1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
Louis Lam 07c0801ad5 Make logout button reactive, improve dropdown menu css 2022-04-20 22:39:07 +08:00
Louis Lam cb55e23718 Add $root.username 2022-04-19 19:40:28 +08:00
Louis Lam d71c086447 Standardize array bracket spacing 2022-04-17 15:27:35 +08:00
Louis Lam 07c474db0b Merge remote-tracking branch 'origin/master' 2022-04-17 01:40:05 +08:00
Louis Lam 8d8c38b1a8 Allow unused vars in args and fix more eslint issues 2022-04-17 01:39:49 +08:00
Nelson Chan 6f99d7577b Fix: Limit saved period & clear when set to recent 2022-04-15 03:24:58 +08:00
Nelson Chan 1417b6eacf Feat: Save and restore chart period 2022-04-15 02:56:21 +08:00
Louis Lam fb0064082e Change Pushdeer to PushDeer 2022-04-14 14:34:30 +08:00
ngc7331 93c51504f9 fixes: formatting and security issues 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-14 14:34:30 +08:00
ngc7331 fb059f5e91 Add support for Pushdeer notifications 2022-04-14 14:34:30 +08:00
PhyxionNL 2e3414135f Update src/components/PingChart.vue 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-14 12:27:38 +08:00
PhyxionNL e44699216e Fix readability of chart hover 2022-04-14 12:27:38 +08:00
ColdThunder11 4656ab3d57 Add OneBot notification service 2022-04-14 10:58:28 +08:00
Louis Lam 3436e26ed4 Fix styleline, fix css format issues globally 2022-04-14 01:20:54 +08:00
Louis Lam 649f3106e1 Enforce semicolon, fix format globally 2022-04-14 01:20:54 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging 
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
 2022-04-12 16:32:14 +08:00
Louis Lam a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +08:00
AnnAngela-work 8e78e62eee Make translation better 2022-04-04 17:24:22 +08:00
AnnAngela 706d6cee07
Update some components to use i18n function, update en & zh-CN translation 2022-04-04 11:33:02 +08:00
Louis Lam 87ee3c20bd Update proxy password field 2022-04-02 11:25:27 +08:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
 2022-04-01 14:57:35 +08:00
Louis Lam c50c20faa4 Minor fix for uk-UA 2022-03-31 16:19:04 +08:00
Denis Stepanov 95b0df0270
Add ukrainian translation 2022-03-30 23:15:28 +03:00
Louis Lam 71be030733 Add package-lock.json and minor words 2022-03-30 18:52:10 +08:00
Louis Lam 82ea896bbc Improve the workflow of cloudflared 2022-03-30 11:59:49 +08:00
Louis Lam f1f4b3b377 Add reverse proxy setting page for controlling cloudflared 2022-03-30 01:49:45 +08:00
Louis Lam 0da6e6b1fb Some improvements 2022-03-29 17:38:48 +08:00
Louis Lam 4545eec3fe Better sticky monitor list 2022-03-21 23:53:55 +08:00
Louis Lam aef0a66205 [Status Page] Simplify show tags logic 2022-03-18 17:56:46 +08:00
Louis Lam 719a136d1e [Status Page] Improved entry page 2022-03-17 22:44:47 +08:00
Louis Lam 1fa4a16663 Check beta release 2022-03-07 16:24:24 +08:00
Louis Lam 6a57c443fd Set telegram as the default notification type 2022-03-07 15:52:17 +08:00
Uğur Erkan 8078d0618d Add socks proxy support to proxy feature 
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
  and moved under proxy class.

Thanks for suggestion @thomasleveil
 2022-03-06 19:34:51 +03:00
Uğur Erkan 78d76512ba Add http and https proxy feature 
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.

Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
 2022-03-06 19:34:49 +03:00
Louis Lam e3a0eaf6af Sort notification types in case-insensitive 2022-03-04 21:48:35 +08:00
Louis Lam 8bbf55777e
Merge pull request #1205 from arjunkomath/master 
Add notification provider - Push
 2022-03-04 21:39:59 +08:00
Louis Lam c52c8a4206 Merge branch 'master' into alerta 
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
 2022-03-04 14:10:37 +08:00
Louis Lam 9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam ccb3d85a48
Merge pull request #1157 from zackelia/master 
Implement gorush notifications
 2022-03-03 22:03:09 +08:00
Louis Lam 602da565eb Sort notification types 2022-03-03 20:49:00 +08:00
Louis Lam 0671e4ea2b Merge remote-tracking branch 'AnnAngela/master' 
# Conflicts:
#	src/languages/zh-CN.js
 2022-03-02 13:43:34 +08:00
Louis Lam 7638b73645 Fix #1300 2022-02-15 23:30:07 +08:00
Louis Lam 986ddd92ff
Merge pull request #1198 from Buchtic/master 
CSY translation
 2022-02-13 14:11:00 +08:00
AnnAngela c75c6c5640
Update zh-CN.js 
Update DingDing and AliyunSms setting dialogs for better translations and document links
 2022-02-11 22:50:46 +08:00
Louis Lam efaa55ad1f
Merge pull request #1269 from holao09/master 
Update Vietnamese language
 2022-02-09 21:42:02 +08:00
Việt Nguyễn daac9ddffc Update Vietnamese language 
Cập nhật một số thông tin tiếng Việt
 2022-02-09 16:17:10 +07:00
James White 6bd2ee8c69 Fix minor typos on disable auth warning 2022-02-08 21:53:15 +00:00
Alvin Pergens cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
Karel Krýda e7b2832967 The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones 2022-01-24 22:33:15 +01:00
Karel Krýda 5fda1f0f59 minor fixes (missing commas, spaces, translations) 2022-01-23 20:33:39 +01:00
Karel Krýda 0d3414c6d6 A complete maintenance planning system has been created 2022-01-23 15:22:00 +01:00
Raphael Bernhart dd3992063e
Apply suggestions from code review 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-22 13:59:36 +01:00
Raphael Bernhart 0313acd4c5 🐛 Fix bug where a condition was wrong-false 2022-01-21 17:22:30 +01:00
Raphael Bernhart cd19b9fc49 💫 Improve hearbeat animation 2022-01-21 17:13:38 +01:00
Raphael Bernhart c57b2c4d28 💄 Fix spacing to get pixel perfectness 2022-01-21 17:13:24 +01:00
Raphael Bernhart 3dda5938f2 💄 Add condition to div tag for styling reasons 2022-01-21 15:39:49 +01:00
Arjun Komath 74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Buchtič 3f8ca82434
cs-CZ translation 2022-01-18 08:48:39 +01:00
Dylan Khor 812e80030b
revert Token because of language file 2022-01-13 23:43:57 -05:00
Dylan Khor b89efa49aa
retain Token verbiage in display name 
since "Token" is used in several places in the 2FA setup screen
 2022-01-13 16:58:46 -05:00
Dylan Khor 6490ef3787
rename 2fa input element id and display name 2022-01-13 16:46:09 -05:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Matteo D 2304c53c8d Fixed some translations 
And made them more user-friendly.
 2022-01-08 13:28:48 +01:00
Philipp Bischoff bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
Leslie Leung 590859a95b
Merge branch 'master' into add-wecom-notification 2022-01-03 21:43:56 +08:00
Louis Lam e18d4b6ad0
Merge pull request #1045 from bilipp/google-chat-notifications 
Add support for Google Chat Notifications
 2021-12-30 00:16:34 +08:00
Louis Lam f6fc3737fc Change name from "Google Chat" to Google Chat (Google Workspace only) 2021-12-30 00:10:54 +08:00
LeslieLeung 40b70277c7 feat(*): support WeCom notification 2021-12-26 13:11:42 +08:00
Nelson Chan 624cd862a5 Feat: Expose SMTP DKIM settings 2021-12-19 13:30:53 +08:00
Erik b10cecb362 Added sl-SI language 
Added sl-SI language
 2021-12-14 17:59:26 +01:00
Philipp Bischoff 8ad6bd31d4 Revert "order notification types by name" 
This reverts commit 8398466860.
 2021-12-12 00:08:33 +01:00
Philipp Bischoff 8398466860 order notification types by name 2021-12-11 23:50:03 +01:00
Philipp Bischoff 8050cb8e99 implement google chat notification type 2021-12-11 23:43:12 +01:00
Andreas Brett e684712a77
Merge branch 'louislam:master' into logging 2021-12-07 18:21:56 +01:00
Louis Lam f331f1a63e
Merge pull request #873 from Saibamen/fix_871 
Fix Telegram Bot Token displayed in notification setup view
 2021-12-05 18:04:54 +08:00
Louis d645e29455 mask telegram api url with asterisk 2021-12-05 17:40:13 +08:00
Andreas Brett dcc7856b5d
Merge branch 'louislam:master' into logging 2021-12-04 09:59:10 +01:00
Jonas Liebert 67849a9e84 add support for stackfield notifications 2021-12-02 08:53:45 +01:00
Louis Lam a796f80018
Merge pull request #902 from ivanbratovic/improve-translatables 
Fix untranslatable parts of the UI
 2021-12-01 13:59:00 +08:00
Andreas Brett c9b0a81cdc
Update MonitorHistory.vue 2021-11-29 20:39:57 +01:00
Andreas Brett 2f97f44086
Update MonitorHistory.vue 2021-11-29 20:37:44 +01:00
Louis Lam 40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider 
Add SerwerSMS.pl notification provider
 2021-11-29 20:43:38 +08:00
Ivan Bratović d95258e7db Merge remote-tracking branch 'upstream/master' into improve-translatables 2021-11-29 12:51:08 +01:00
Louis Lam 6cd130de38 minor 2021-11-29 17:20:12 +08:00
kffl 186c11540f
style(serwersms): add missing trailing commas 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-27 13:16:17 +01:00
Louis Lam 50593f3edf [wip] lazy load language file 2021-11-26 16:31:19 +08:00
Paweł Kuffel c1267e9b3b feat: add SerwerSMS notification provider 2021-11-25 18:24:36 +01:00
Ivan Bratović 2ca7a5b962
Merge branch 'master' into improve-translatables 2021-11-24 10:03:30 +01:00
Nelson Chan df813fbdee Fix: Add save in monitor history 2021-11-17 10:45:19 +08:00
Nelson Chan 07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08:00
Nelson Chan 369cad90c1 WIP: Convert to use vue-router & improve layout 
WIP: Fix security page & improve layout

WIP: Fix displaying current page

UI: Improve spacing

Chore: Improve styling
 2021-11-17 10:45:18 +08:00
Nelson Chan f9bb48de13 WIP: Convert Settings to components 2021-11-17 10:45:18 +08:00
Ivan 4cc433166e Add missing translation for SMTP security option 2021-11-11 11:14:21 +01:00
Ivan 28f530394e Add missing translation lookup for ClickSendSMS 2021-11-11 11:12:48 +01:00
Adam Stachowicz ba46fb6b1c Clickable URL 2021-11-10 09:11:19 +01:00
Louis Lam ad82ab0305
Merge pull request #883 from andreasbrett/patch-7 
24h tooltip on status page
 2021-11-07 17:24:03 +08:00
Andreas Brett 8f44b9f618 24h tooltip on status page 2021-11-05 09:54:10 +01:00
Adam Stachowicz 314fa18bdc Fix #871 2021-11-04 00:19:04 +01:00
Jasper Miller-Waugh 348c5ec995
Match lint settings 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 9143b73f84
Styling for tags 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 5e6d945095
Most hacked in POC 2021-10-30 21:16:10 +13:00
Louis Lam 77addfebc8 Merge branch 'tarun7singh_master' 
# Conflicts:
#	src/languages/vi.js
 2021-10-26 16:26:59 +08:00
Louis Lam d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification 
Support for Bark (APN) notifications
 2021-10-26 16:23:11 +08:00
Louis Lam 78424b4f2d add simple loading chart effect 2021-10-26 12:48:21 +08:00
Louis Lam f8055ed03d minor css 2021-10-26 12:33:46 +08:00
Tarun Singh ba1e025353 added click send to number 2021-10-25 04:11:57 -04:00
Tarun Singh bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Nelson Chan 665bae0806 UI: Simplify dropdown design 2021-10-24 01:45:57 +08:00
Nelson Chan e4be28a9e7 Fix: Validate beat time before appending 2021-10-24 01:45:38 +08:00
Nelson Chan 445674aacb Chore: Improve code formatting & comments 2021-10-24 01:45:10 +08:00
Nelson Chan 2f7b60f5e5 Feat: Use separate storage for custom chart period 
Fix: Fix import error
 2021-10-24 01:44:55 +08:00
Nelson Chan b83c59e308 WIP: Add options for chart period 
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
 2021-10-24 01:44:08 +08:00
Lakr Aream ce852dfa02 Support for Bark (APN) notifications 
Update bark.js
 2021-10-24 00:31:43 +08:00
Louis Lam 8a481a1be0
Merge pull request #769 from andreasbrett/patch-5 
show beat.msg only if available
 2021-10-22 18:14:52 +08:00
Andreas Brett 657987a013 fix: show beat.msg only if available 2021-10-22 11:59:53 +02:00
MrEddX 6463d4b209
Fix: Integration Link Text 
Maybe left there from the Slack template.
 2021-10-20 09:09:08 +03:00
Lukas f74b2662c5 Fixed values for sms type 2021-10-18 12:02:54 +02:00
Louis Lam 6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Louis Lam 4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +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 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
xJoker 8ab4788f80
Update src/components/notifications/index.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 09:33:36 +08:00
xJoker 4e4ab0577e
Update src/components/notifications/index.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 09:33:31 +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
wuwenjing a2f2253221 Add aliyun sms notification 2021-10-13 11:55:01 +08:00
zsxeee 3fe91c52cb
Fix i18n 
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
 2021-10-12 16:29:18 +08:00