diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
| commit | 6c278cfe09fb9fd5220743d8f69c6e232623a09b (patch) | |
| tree | 93f1716551e6677193b05f33583579e68ad512c2 /CHANGELOG.md | |
| parent | e8395bedd2164723b641e1e28cf08e40875893bf (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.tar.gz pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.zip | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cc0cee93..0fe84bbd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity - 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 - Pleroma API: Add Emoji reactions ### Changed @@ -26,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Return `pleroma.direct_conversation_id` when creating a direct message (`POST /api/v1/statuses`) - 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 ### 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`) |