diff options
| author | lain <lain@soykaf.club> | 2019-10-10 12:38:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-10 12:38:51 +0000 |
| commit | d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e (patch) | |
| tree | f99394ee5d40b8c1bff6301acd683e13dc23edc8 /CHANGELOG.md | |
| parent | 6c278cfe09fb9fd5220743d8f69c6e232623a09b (diff) | |
| parent | 9fd5176c35d21846fb8368ea7bc0285f9cd74ad4 (diff) | |
| download | pleroma-d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e.tar.gz pleroma-d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e.zip | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fe84bbd3..31aa567b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - OAuth: support for hierarchical permissions / [Mastodon 2.4.3 OAuth permissions](https://docs.joinmastodon.org/api/permissions/) - Authentication: Added rate limit for password-authorized actions / login existence checks - Metadata Link: Atom syndication Feed +- Mix task to re-count statuses for all users (`mix pleroma.count_statuses`) - Pleroma API: Add Emoji reactions ### Changed @@ -28,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Admin API: Return link alongside with token on password reset - MRF (Simple Policy): Also use `:accept`/`:reject` on the actors rather than only their activities - OStatus: Extract RSS functionality +- Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`) ### Fixed - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) @@ -86,6 +88,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ActivityPub: Fix `/users/:nickname/inbox` crashing without an authenticated user - MRF: fix ability to follow a relay when AntiFollowbotPolicy was enabled - Mastodon API: Blocks are now treated consistently between the Streaming API and the Timeline APIs +- Mastodon API: `exclude_replies` is correctly handled again. ### Added - Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically. |