From a0b117450e25a6804af29990d19ae0598a6e1dbe Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Mon, 11 Jul 2022 18:27:31 +0200 Subject: [PATCH] Update README.md --- README.md | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 67ad912e6f..ac282b1f50 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,25 @@ # Catstodon - ## Introduction - This Mastodon fork is based on the [glitch-soc Fork of Mastodon](https://github.com/glitch-soc/mastodon). +I intend to contribute some useful differences back to [glitch-soc](https://github.com/glitch-soc/mastodon) and [vanilla Mastodon](https://github.com/mastodon/mastodon). -- To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and features are the same, except for the differences outlined below. -- Contributing guidelines are available [here](CONTRIBUTING.md). +To install, take a look at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/). The instructions and features are the same, except for the differences outlined below. + +Contributing guidelines are available [here](CONTRIBUTING.md). ## Differences - - Some files are adjusted specifically for the CatCatNya~ instance. Specifically, these: - sounds/boop.mp3 - sounds/boop.ogg - - You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance. +
You might want to revert these to the upstream files (or your own versions!) if you decide to use this fork for your own instance. - The web frontend emoji picker is a blobcat instead of the joy emoji. -- Editing posts is enabled in the web frontend (thanks, meave [for the hint](https://toot.site/@meave/108515761669028663)). -- The period of retention of IP addresses was made configurable. -- The period of retention of sessions was made configurable. +- Editing posts is enabled in the web frontend (thanks, meave, [for the hint](https://toot.site/@meave/108515761669028663)). - The rate limits for authenticated users have been relaxed a bit. - The API endpoint `/api/v1/custom_emojis` is no longer affected by AUTHORIZED_FETCH, allowing anyone to copy custom emojis. +- Allow higher resolution images. (4096x4096 instead of the previous limit of 1920x1080) + +## Previous differences now merged into glitch-soc +- Fixed incorrect upload size limit display when adding new a new custom emoji. ([Pull request](https://github.com/glitch-soc/mastodon/pull/1763)) + +## Previous differences now merged into vanilla Mastodon +- The period of retention of IP addresses and sessions was made configurable. ([Pull request](https://github.com/mastodon/mastodon/pull/18757))