From 62fffce1e827c95d0512c9088156e4703dc1307e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 24 Jun 2021 18:16:48 +0000 Subject: [PATCH 1/3] Adjusted documentation --- doc/API-Mastodon.md | 6 ------ doc/FAQ.md | 9 +++++++++ doc/de/FAQ.md | 9 +++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/doc/API-Mastodon.md b/doc/API-Mastodon.md index b01de4eb36..2c0f613a25 100644 --- a/doc/API-Mastodon.md +++ b/doc/API-Mastodon.md @@ -27,12 +27,6 @@ For supported apps please have a look at the [FAQ](help/FAQ#clients) - [Mast](https://github.com/Beesitech/Mast) Doesn't accept the entered instance name. Claims that it is invalid (Message is: "Not a valid instance (may be closed or dead)") - [Toot!](https://apps.apple.com/app/toot/id1229021451) -#### Desktop - -- [Halycon](https://www.halcyon.social/) Doesn't load content, creates masses of HTTP requests -- [Mastonaut](https://mastonaut.app/) -- [Pinafore](https://github.com/nolanlawson/pinafore) Returns message "Error: NetworkError when attempting to fetch resource.. Is this a valid Mastodon instance?" - ## Entities These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/entities/). diff --git a/doc/FAQ.md b/doc/FAQ.md index 44679db643..d5d742cb79 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -227,12 +227,21 @@ Here is a list of known working clients: * [Toot](https://toot.readthedocs.io/en/latest/) * [Tootle](https://github.com/bleakgrey/tootle) +#### MacOS + +- [Mastonaut](https://mastonaut.app/) + #### Windows * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10) Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy). +#### Desktop + +- [Halycon](https://www.halcyon.social/) +- [Pinafore](https://github.com/nolanlawson/pinafore) + Admin -------- diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md index d9f1742c87..92c7740419 100644 --- a/doc/de/FAQ.md +++ b/doc/de/FAQ.md @@ -239,10 +239,19 @@ Hier ist eine Liste von Clients, die speziell für Friendica entwickelt werden o * [Toot](https://toot.readthedocs.io/en/latest/) * [Tootle](https://github.com/bleakgrey/tootle) +#### MacOS + +- [Mastonaut](https://mastonaut.app/) + #### Windows * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10 +#### Desktop + +- [Halycon](https://www.halcyon.social/) +- [Pinafore](https://github.com/nolanlawson/pinafore) + Admin -------- From 4f35e954a4a843749b198ccc1b0b953ded74c995 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 24 Jun 2021 20:19:28 +0000 Subject: [PATCH 2/3] Halcyon is Halcyon --- doc/FAQ.md | 2 +- doc/de/FAQ.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index d5d742cb79..ec8c26d7c8 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -239,7 +239,7 @@ Depending on the features of the client you might encounter some glitches in usa #### Desktop -- [Halycon](https://www.halcyon.social/) +- [Halcyon](https://www.halcyon.social/) - [Pinafore](https://github.com/nolanlawson/pinafore) Admin diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md index 92c7740419..be6e68b1fe 100644 --- a/doc/de/FAQ.md +++ b/doc/de/FAQ.md @@ -249,7 +249,7 @@ Hier ist eine Liste von Clients, die speziell für Friendica entwickelt werden o #### Desktop -- [Halycon](https://www.halcyon.social/) +- [Halcyon](https://www.halcyon.social/) - [Pinafore](https://github.com/nolanlawson/pinafore) Admin From c06c515e02276a52de3e2e7bff2fc8066c337720 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 24 Jun 2021 20:21:06 +0000 Subject: [PATCH 3/3] Desktop is Web --- doc/FAQ.md | 2 +- doc/de/FAQ.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index ec8c26d7c8..4a310041b0 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -237,7 +237,7 @@ Here is a list of known working clients: Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy). -#### Desktop +#### Web Frontend - [Halcyon](https://www.halcyon.social/) - [Pinafore](https://github.com/nolanlawson/pinafore) diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md index be6e68b1fe..ff602c0eb8 100644 --- a/doc/de/FAQ.md +++ b/doc/de/FAQ.md @@ -247,7 +247,7 @@ Hier ist eine Liste von Clients, die speziell für Friendica entwickelt werden o * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10 -#### Desktop +#### Web - [Halcyon](https://www.halcyon.social/) - [Pinafore](https://github.com/nolanlawson/pinafore)