diff options
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/README.md b/README.md index 502e0d8db..f0b4ba455 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,10 @@  ======== -[](https://hub.docker.com/repository/docker/pluralcafe/mastodon) [](https://plural.cafe) +[](https://plural.cafe) 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. **Ruby on Rails** is used for the back-end, while **React.js** and Redux are used for the dynamic front-end. A static front-end for public resources (profiles and statuses) is also provided. -This repository specifically is for [Plural Café](https://plural.cafe) and has three branches: - -* **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. - -In addition, there are several repositories in this GitHub organization: - -* **pluralcafe/mastodon** is this repository and is the codebase for what Plural Café runs, -* [**pluralcafe/utils**](https://github.com/pluralcafe/utils) are an assortment of scripts and tutorials to help in Mastodon system administration or general helper files this instance uses, -* [**pluralcafe/barkeep**](https://github.com/pluralcafe/barkeep) is forked from [mbilokonsky/ambassador](https://github.com/mbilokonsky/ambassador) and serves as the Ambassador bot that is run on the instance. - -This instance is a fork of a fork: this has the [Mastodon Glitch Edition](https://github.com/glitch-soc/mastodon) commits. Documentation for Mastodon Glitch Edition [can be found here](https://glitch-soc.github.io/docs/). Anyone wishing to use Glitch Edition in a Docker image for their own site can use the `pluralcafe/mastodon:glitch` image. - ---- - -## Notable changes from upstream - -See output of `git log glitch..main --oneline | grep -v '[mM]erge' | less` for a (more) complete history. - -* <ol> margin issue fixed so numbered lists aren't cut off a few pixels shy of 1 number -* HTML summary/details tags are allowed in toots -* gemini protocol links are supported (not yet supported: automatically marking gemini:// text as links) -* authentication required for account api endpoints to block some naive scrapers +This repository specifically is for [Plural Café](https://plural.cafe) and is a fork of a fork based on [Mastodon Glitch Edition](https://github.com/glitch-soc/mastodon). Documentation for Mastodon Glitch Edition [can be found here](https://glitch-soc.github.io/docs/). |