From: lain <lain@soykaf.club>
Date: Wed, 9 Oct 2019 15:10:08 +0000 (+0000)
Subject: Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=1357ec1a106fa20a1f040bf8ef37a38c8b96aea6;hp=-c;p=akkoma

Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'

Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`

See merge request pleroma/pleroma!1822
---

1357ec1a106fa20a1f040bf8ef37a38c8b96aea6
diff --combined CHANGELOG.md
index 759745dd2,da921b98e..bd06ec866
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,7 -16,6 +16,7 @@@ The format is based on [Keep a Changelo
  - 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
 +- Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
@@@ -28,6 -27,7 +28,7 @@@
  - 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
+ - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
  
  ### 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`)