From: Maxim Filippov <colixer@gmail.com>
Date: Tue, 5 Nov 2019 01:36:47 +0000 (+1000)
Subject: Merge branch 'develop' into feature/multiple-users-force-password-reset
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2cbfa256fd911b66a28c78008d1d622bfdb5d345;p=akkoma

Merge branch 'develop' into feature/multiple-users-force-password-reset
---

2cbfa256fd911b66a28c78008d1d622bfdb5d345
diff --cc CHANGELOG.md
index 989e0974a,77edf7bf0..85079512a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -65,9 -66,9 +66,10 @@@ The format is based on [Keep a Changelo
  - OStatus: Extract RSS functionality
  - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
  - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
- </details>
  - Deprecated `User.Info` embedded schema (fields moved to `User`)
 +- **Breaking** Admin API: `PATCH /api/pleroma/admin/users/:nickname/force_password_reset` is now `PATCH /api/pleroma/admin/users/force_password_reset` (accepts `nicknames` array in the request body)
+ - Store status data inside Flag activity
+ </details>
  
  ### Fixed
  - Report emails now include functional links to profiles of remote user accounts