diff options
| -rw-r--r-- | README.md | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/README.md b/README.md index 4e10cbcd7..30f860768 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@  ======== -[][circleci] -[circleci]: https://circleci.com/gh/glitch-soc/mastodon +  Mastodon is a **free, open-source social network server** based on **open web protocols** like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools. @@ -10,7 +9,7 @@ Mastodon is a **free, open-source social network server** based on **open web pr This repository specifically is for [Plural Café](https://plural.cafe) and has three branches: -* **master** (**edge** on Docker Hub) for all development and staging work, +* **main** (**edge** on Docker Hub) for all development and staging work, * **glitch** for all commits from upstream that will automatically be synched to this repository, and * **production** (**latest** on Docker Hub) for what goes onto the main website. @@ -24,42 +23,8 @@ This instance is a fork of a fork: this has the [Mastodon Glitch Edition](https: --- -## Resources - -- [Frequently Asked Questions](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md) -- [Use this tool to find Twitter friends on Mastodon](https://bridge.joinmastodon.org) -- [API overview](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md) -- [List of Mastodon instances](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/List-of-Mastodon-instances.md) -- [List of apps](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md) -- [List of sponsors](https://joinmastodon.org/sponsors) - -## Features - -**No vendor lock-in: Fully interoperable with any conforming platform** - -It doesn't have to be Mastodon, whatever implements ActivityPub or OStatus is part of the social network! - -**Real-time timeline updates** - -See the updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well! - -**Federated thread resolving** - -If someone you follow replies to a user unknown to the server, the server fetches the full thread so you can view it without leaving the UI - -**Media attachments like images and short videos** - -Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos are looped - like vines! - -**OAuth2 and a straightforward REST API** - -Mastodon acts as an OAuth2 provider so 3rd party apps can use the API - -**Fast response times** - -Mastodon tries to be as fast and responsive as possible, so all long-running tasks are delegated to background processing - -**Deployable via Docker** - -You don't need to mess with dependencies and configuration if you want to try Mastodon, if you have Docker and Docker Compose the deployment is extremely easy +## Changes from Upstream +* 2126fd0cd tweak to ordered list display +* 3de0fecfa support summary/details HTML +* cb7608c37 allow gemini protocol links \ No newline at end of file |