diff --git a/Makefile b/Makefile index f2e741d5..b2f40bcc 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,18 @@ build-deps-ubuntu: docs: docs-deps docs-build docs-build: .PHONY - mkdocs build + @if ! /bin/echo -e "import sys\nif sys.version_info < (3,8):\n exit(1)" | python3; then \ + if which python3.8; then \ + echo "python3.8 $(shell which mkdocs) build"; \ + python3.8 $(shell which mkdocs) build; \ + else \ + echo "ERROR: Python version too low. mkdocs-material needs >= 3.8"; \ + exit 1; \ + fi; \ + else \ + echo "mkdocs build"; \ + mkdocs build; \ + fi docs-deps: .PHONY pip3 install -r requirements.txt diff --git a/README.md b/README.md index f6969459..dbcd0c61 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ [![codecov](https://codecov.io/gh/binwiederhier/ntfy/branch/main/graph/badge.svg?token=A597KQ463G)](https://codecov.io/gh/binwiederhier/ntfy) [![Discord](https://img.shields.io/discord/874398661709295626?label=Discord)](https://discord.gg/cT7ECsZj9w) [![Matrix](https://img.shields.io/matrix/ntfy:matrix.org?label=Matrix)](https://matrix.to/#/#ntfy:matrix.org) +[![Matrix space](https://img.shields.io/matrix/ntfy-space:matrix.org?label=Matrix+space)](https://matrix.to/#/#ntfy-space:matrix.org) [![Healthcheck](https://healthchecks.io/badge/68b65976-b3b0-4102-aec9-980921/kcoEgrLY.svg)](https://ntfy.statuspage.io/) **ntfy** (pronounce: *notify*) is a simple HTTP-based [pub-sub](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) notification service. It allows you to **send notifications to your phone or desktop via scripts** from any computer, entirely **without signup or cost**. It's also open source (as you can plainly see) if you want to run your own. -I run a free version of it at **[ntfy.sh](https://ntfy.sh)**, and there's an [open source](https://github.com/binwiederhier/ntfy-android) [Android app](https://play.google.com/store/apps/details?id=io.heckel.ntfy) -too. +I run a free version of it at **[ntfy.sh](https://ntfy.sh)**. There's also an [open source Android app](https://github.com/binwiederhier/ntfy-android) (see [Google Play](https://play.google.com/store/apps/details?id=io.heckel.ntfy) or [F-Droid](https://f-droid.org/en/packages/io.heckel.ntfy/)), and an [open source iOS app](https://github.com/binwiederhier/ntfy-ios) (see [App Store](https://apps.apple.com/us/app/ntfy/id1625396347)).

diff --git a/docs/examples.md b/docs/examples.md index 26be6b30..6183b670 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -433,3 +433,13 @@ notify: message_param_name: message resource: https://ntfy.sh ``` + +## Uptime Kuma +- Go to your [Uptime Kuma](https://github.com/louislam/uptime-kuma) Settings > Notifications, click on **Setup Notification** +- ![Uptime Kuma Settings](static/img/uptimekuma-settings.png) +- Set your desired **title** (e.g. "Uptime Kuma"), **ntfy topic**, **Server URL** and **priority (1-5)** +- ![Uptime Kuma Setup](static/img/uptimekuma-setup.png) +- You can now test the notifications and apply them to monitors. +- ![Uptime Kuma iOS Test](static/img/uptimekuma-ios-test.jpg) +- ![Uptime Kuma iOS Down](static/img/uptimekuma-ios-down.jpg) +- ![Uptime Kuma iOS Up](static/img/uptimekuma-ios-up.jpg) \ No newline at end of file diff --git a/docs/releases.md b/docs/releases.md index 605a8fb4..4629d678 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -16,6 +16,11 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release **Features:** * Windows CLI is now available via [Scoop](https://scoop.sh) ([ScoopInstaller#3594](https://github.com/ScoopInstaller/Main/pull/3594), [#311](https://github.com/binwiederhier/ntfy/pull/311), [#269](https://github.com/binwiederhier/ntfy/issues/269), thanks to [@kzshantonu](https://github.com/kzshantonu)) +* [Uptime Kuma](https://github.com/louislam/uptime-kuma) now allows publishing to ntfy ([uptime-kuma#1674](https://github.com/louislam/uptime-kuma/pull/1674), thanks to [@philippdormann](https://github.com/philippdormann)) + +**Documentation** + +* Added [example](examples.md) for [Uptime Kuma](https://github.com/louislam/uptime-kuma) integration ([#315](https://github.com/binwiederhier/ntfy/pull/315), thanks to [@philippdormann](https://github.com/philippdormann)) ## ntfy iOS app v1.2 (UNRELEASED) diff --git a/docs/static/img/uptimekuma-ios-down.jpg b/docs/static/img/uptimekuma-ios-down.jpg new file mode 100644 index 00000000..330f86f9 Binary files /dev/null and b/docs/static/img/uptimekuma-ios-down.jpg differ diff --git a/docs/static/img/uptimekuma-ios-test.jpg b/docs/static/img/uptimekuma-ios-test.jpg new file mode 100644 index 00000000..1b678a69 Binary files /dev/null and b/docs/static/img/uptimekuma-ios-test.jpg differ diff --git a/docs/static/img/uptimekuma-ios-up.jpg b/docs/static/img/uptimekuma-ios-up.jpg new file mode 100644 index 00000000..919d9ba1 Binary files /dev/null and b/docs/static/img/uptimekuma-ios-up.jpg differ diff --git a/docs/static/img/uptimekuma-settings.png b/docs/static/img/uptimekuma-settings.png new file mode 100644 index 00000000..5b21bdd6 Binary files /dev/null and b/docs/static/img/uptimekuma-settings.png differ diff --git a/docs/static/img/uptimekuma-setup.png b/docs/static/img/uptimekuma-setup.png new file mode 100644 index 00000000..cd57baa7 Binary files /dev/null and b/docs/static/img/uptimekuma-setup.png differ diff --git a/web/public/static/langs/nl.json b/web/public/static/langs/nl.json index 11954852..2b7990ec 100644 --- a/web/public/static/langs/nl.json +++ b/web/public/static/langs/nl.json @@ -62,8 +62,8 @@ "notifications_click_copy_url_title": "URL naar klembord kopiëren", "notifications_click_copy_url_button": "Link kopiëren", "notifications_click_open_button": "Link openen", - "notifications_none_for_topic_description": "Om notificaties naar dit onderwerp te sturen, doe een PUT of POST naar het onderwerp URL.", - "notifications_none_for_any_description": "Om notificaties naar dit onderwerp te sturen, doe een PUT of POST naar het onderwerp URL. Hier is een voorbeeld met één van je onderwerpen.", + "notifications_none_for_topic_description": "Om notificaties naar dit onderwerp te sturen, doe een PUT of POST naar de URL van het onderwerp.", + "notifications_none_for_any_description": "Om notificaties naar dit onderwerp te sturen, doe een PUT of POST naar de URL van het onderwerp. Hier is een voorbeeld met één van je onderwerpen.", "notifications_no_subscriptions_title": "Het lijkt erop dat je nog op geen onderwerpen geabonneerd bent.", "notifications_no_subscriptions_description": "Klik op de \"{{linktext}}\" link om een onderwerp te maken of erop te abonneren. Daarna kan je berichten sturen via PUT of POST and ontvang je hier notificaties.", "notifications_example": "Voorbeeld", @@ -148,12 +148,12 @@ "prefs_notifications_sound_title": "Meldingsgeluid", "prefs_notifications_sound_description_none": "Notificaties zullen geen geluid geven", "prefs_notifications_sound_play": "Geselecteerd geluid afspelen", - "prefs_notifications_sound_description_some": "Inkomende notificaties zullen het {{sound}} afspelen", + "prefs_notifications_sound_description_some": "Inkomende notificaties zullen het {{sound}} geluid afspelen", "prefs_notifications_sound_no_sound": "Geen geluid", "prefs_notifications_min_priority_title": "Minimale prioriteit", "prefs_notifications_min_priority_description_any": "Toon alle notificaties, ongeacht prioriteit", - "prefs_notifications_min_priority_description_x_or_higher": "Toon notificaties als prioriteit is {{number}} ({{name}}) of hoger", - "prefs_notifications_min_priority_description_max": "Toon notificaties als prioriteit is 5 (maximaal)", + "prefs_notifications_min_priority_description_x_or_higher": "Toon notificaties als prioriteit {{number}} ({{name}}) is of hoger", + "prefs_notifications_min_priority_description_max": "Toon notificaties als prioriteit 5 (maximaal) is", "prefs_notifications_min_priority_any": "Elke prioriteit", "prefs_notifications_min_priority_low_and_higher": "Lage prioriteit en hoger", "prefs_notifications_min_priority_default_and_higher": "Standaard prioriteit en hoger", diff --git a/web/public/static/langs/zh_Hans.json b/web/public/static/langs/zh_Hans.json index e084bcf2..58b3561f 100644 --- a/web/public/static/langs/zh_Hans.json +++ b/web/public/static/langs/zh_Hans.json @@ -80,7 +80,7 @@ "publish_dialog_delay_label": "延期", "publish_dialog_other_features": "其它功能：", "publish_dialog_attach_placeholder": "使用链接地址附加文件，例如 https://f-droid.org/F-Droid.apk", - "publish_dialog_delay_reset": "删除延迟交付", + "publish_dialog_delay_reset": "删除延期投递", "publish_dialog_attach_reset": "移除附件链接地址", "publish_dialog_chip_click_label": "点击链接地址", "publish_dialog_chip_email_label": "转发邮件", @@ -95,7 +95,7 @@ "emoji_picker_search_placeholder": "查找表情符号", "emoji_picker_search_clear": "清除搜索", "subscribe_dialog_subscribe_title": "订阅主题", - "publish_dialog_chip_delay_label": "延迟交付", + "publish_dialog_chip_delay_label": "延期投递", "publish_dialog_chip_attach_url_label": "链接附件地址", "subscribe_dialog_subscribe_use_another_label": "使用其他服务器", "subscribe_dialog_subscribe_button_subscribe": "订阅", @@ -187,5 +187,5 @@ "publish_dialog_tags_placeholder": "英文逗号分隔标记列表，例如 warning, srv1-backup", "publish_dialog_details_examples_description": "有关所有发送功能的示例和详细说明，请参阅文档。", "subscribe_dialog_subscribe_description": "主题可能不受密码保护，因此请选择一个不容易猜测的名字。订阅后，您可以使用 PUT/POST 通知。", - "publish_dialog_delay_placeholder": "延迟交付，例如{{unixTimestamp}}、{{relativeTime}}或“{{naturalLanguage}}”（仅限英语）" + "publish_dialog_delay_placeholder": "延期投递，例如 {{unixTimestamp}}、{{relativeTime}}或「{{naturalLanguage}}」（仅限英语）" }