From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 9 Jul 2019 17:49:04 +0000 (-0500)
Subject: Merge branch 'develop' into feature/allow-user-query-via-id
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96;p=akkoma

Merge branch 'develop' into feature/allow-user-query-via-id
---

9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96
diff --cc CHANGELOG.md
index 86991efe9,2d59639bd..3473e8acb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,10 -6,12 +6,13 @@@ The format is based on [Keep a Changelo
  ## [Unreleased]
  ### Added
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
+ Configuration: `federation_incoming_replies_max_depth` option
  - Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses)
++- Mastodon API, streaming: Add support for passing the token in the `Sec-WebSocket-Protocol` header
  - Admin API: Return users' tags when querying reports
  - Admin API: Return avatar and display name when querying users
 -- Mastodon API, streaming: Add support for passing the token in the `Sec-WebSocket-Protocol` header
 +- Admin API: Allow querying user by ID
+ - Added synchronization of following/followers counters for external users
  
  ### Fixed
  - Not being able to pin unlisted posts