diff options
author | kaniini <ariadne@dereferenced.org> | 2019-10-07 10:19:24 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-10-07 10:19:24 +0000 |
commit | 93bdc55306895dce0554e7838ecf2ea7ddaea3a7 (patch) | |
tree | 4e585d38cf71a92b43b164f7e81bf5c3029b184f /CHANGELOG.md | |
parent | 15592f1abe117761b90846e02194a35982f3bebf (diff) | |
parent | 58aeabd020ae7355aea6b63a331b164e8b23a6c0 (diff) | |
download | pleroma-93bdc55306895dce0554e7838ecf2ea7ddaea3a7.tar.gz pleroma-93bdc55306895dce0554e7838ecf2ea7ddaea3a7.zip |
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d6d6950..f480a3f72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Admin API: Return `total` when querying for reports - 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 ### 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`) |