From: Maxim Filippov <colixer@gmail.com>
Date: Fri, 18 Oct 2019 16:35:58 +0000 (+0200)
Subject: Merge branch 'develop' into feature/relay-list
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=019147f1153f0df844997c04c31753c18a22509f;p=akkoma

Merge branch 'develop' into feature/relay-list
---

019147f1153f0df844997c04c31753c18a22509f
diff --cc CHANGELOG.md
index f91bf63c4,cc6ed3f7e..1135ccb62
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,30 -49,32 +49,46 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
  - Admin API: `/users/:nickname/toggle_activation` endpoint is now deprecated in favor of: `/users/activate`, `/users/deactivate`, both accept `nicknames` array
  - 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
 +
 +### 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
+ </details>
  
  ### Fixed
+ - Report emails now include functional links to profiles of remote user accounts
+ <details>
+   <summary>API Changes</summary>
+ 
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
  - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
- - Added `:instance, extended_nickname_format` setting to the default config
- - Report emails now include functional links to profiles of remote user accounts
+ </details>
  
- ## [1.1.0] - 2019-??-??
- **Breaking:** The stable branch has been changed from `master` to `stable`, `master` now points to `release/1.0`
+ ## [1.1.1] - 2019-10-18
+ ### Fixed
+ - One of the migrations between 1.0.0 and 1.1.0 wiping user info of the relay user because of unexpected behavior of postgresql's `jsonb_set`, resulting in inability to post in the default configuration. If you were affected, please run the following query in postgres console, the relay user will be recreated automatically:
+ ```
+ delete from users where ap_id = 'https://your.instance.hostname/relay';
+ ```
+ - Bad user search matches
+ 
+ ## [1.1.0] - 2019-10-14
+ **Breaking:** The stable branch has been changed from `master` to `stable`. If you want to keep using 1.0, the `release/1.0` branch will receive security updates for 6 months after 1.1 release.
+ 
+ **OTP Note:** `pleroma_ctl` in 1.0 defaults to `master` and doesn't support specifying arbitrary branches, making `./pleroma_ctl update` fail. To fix this, fetch a version of `pleroma_ctl` from 1.1 using the command below and proceed with the update normally:
+ ```
+ curl -Lo ./bin/pleroma_ctl 'https://git.pleroma.social/pleroma/pleroma/raw/develop/rel/files/bin/pleroma_ctl'
+ ```
  ### Security
  - Mastodon API: respect post privacy in `/api/v1/statuses/:id/{favourited,reblogged}_by`