Merge remote-tracking branch 'upstream/develop' into feature/move-activity

diff --cc CHANGELOG.md
index acfe4ceb1a2f1bb575b340b43aca0ac9217c3af2,e04b96281661c8f328476dcb3b2a5217619bc4ee..3d48cd65ae27e2341bae03777f711ede0b4c5580
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -51,23 -59,11 +59,12 @@@ The format is based on [Keep a Changelo
  - Admin API: `POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group` are deprecated in favor of: `POST/DELETE /api/pleroma/admin/users/permission_group/:permission_group` (both accept `nicknames` array), `DELETE /api/pleroma/admin/users` (`nickname` query param or `nickname` sent in JSON body) is deprecated in favor of: `DELETE /api/pleroma/admin/users` (`nicknames` query array param or `nicknames` sent in JSON body).
  - Admin API: Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
  - Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all conversations as read
 +- ActivityPub: Support `Move` activities
  - Mastodon API: Add `/api/v1/markers` for managing timeline read markers
- 
- ### Changed
- - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
- - **Breaking:** Admin API: Return link alongside with token on password reset
- - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
- - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
- - 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
- - 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
+ - Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
+ - Configuration: `feed` option for user atom feed.
+ - Pleroma API: Add Emoji reactions
  </details>
- - Deprecated `User.Info` embedded schema (fields moved to `User`)
  
  ### Fixed
  - Report emails now include functional links to profiles of remote user accounts

diff --cc docs/API/differences_in_mastoapi_responses.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

diff --cc priv/static/schemas/litepub-0.1.jsonld
index 509df4bb7c023875c521155613f1fc61a417a48f,8bae42f6da9e4e80a877a58b864fc2131e663d7e..e7ebf72be15630be73d62c53d244374ee7101946
--- 1/priv/static/schemas/litepub-0.1.jsonld
--- 2/priv/static/schemas/litepub-0.1.jsonld
+++ b/priv/static/schemas/litepub-0.1.jsonld
@@@ -29,10 -29,7 +29,11 @@@
                  "@id": "litepub:oauthRegistrationEndpoint",
                  "@type": "@id"
              },
 -            "EmojiReaction": "litepub:EmojiReaction"
++            "EmojiReaction": "litepub:EmojiReaction",
 +            "alsoKnownAs": {
 +                "@id": "as:alsoKnownAs",
 +                "@type": "@id"
 +            }
          }
      ]
  }

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge