diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-29 00:34:14 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-29 00:34:14 +0000 |
| commit | f31ad5549b4048e03171ef9ab83ed6c0815745cc (patch) | |
| tree | 8e964eeab708688b12c8cd11235704b30d704793 | |
| parent | 239cf46eb42240d97b4bfa66e61cc54bdcbbbee6 (diff) | |
| parent | e46dfd929548758cb99f8ea1bd7bf7e60b65833b (diff) | |
| download | pleroma-f31ad5549b4048e03171ef9ab83ed6c0815745cc.tar.gz | |
Merge branch 'chores/1691-breaking-change' into 'develop'
!1691 is a breaking change + documentation fixes
See merge request pleroma/pleroma!1739
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | docs/api/admin_api.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d307f0e1..43a204be5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,11 +15,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### 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 - Mastodon API: notifications no longer include subscription notifications - they are now served from new endpoints in Pleroma API ### 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`) diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md index 8795c2628..ee9e68cb1 100644 --- a/docs/api/admin_api.md +++ b/docs/api/admin_api.md @@ -312,8 +312,8 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret ```json { - "token": "U13DX6muOvpRsj35_ij9wLxUbkU-eFvfKttxs6gIajo=", // password reset token (base64 string) - "link": "https://pleroma.social/api/pleroma/password_reset/U13DX6muOvpRsj35_ij9wLxUbkU-eFvfKttxs6gIajo%3D" + "token": "base64 reset token", + "link": "https://pleroma.social/api/pleroma/password_reset/url-encoded-base64-token" } ``` |