summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-10-07 02:14:45 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-10-07 02:14:45 +0000
commitb4f3c16885a489c40de82e5ef321caafa4b10c81 (patch)
treee81e3d7ba6882b31bd18c221f872049af73e44f2 /CHANGELOG.md
parent25cffffaf1685ef02cd318bdbd99bb325d295458 (diff)
parentb93856874de673f1c05c557ad482d4480ca7e0a7 (diff)
downloadpleroma-b4f3c16885a489c40de82e5ef321caafa4b10c81.tar.gz
pleroma-b4f3c16885a489c40de82e5ef321caafa4b10c81.zip
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 607643b7c..1c7f93926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item
- Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance`
- 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/)
### Changed
- **Breaking:** Elixir >=1.8 is now required (was >= 1.7)