From: Maxim Filippov Date: Mon, 16 Sep 2019 11:40:17 +0000 (+0300) Subject: Merge branch 'develop' into feature/return-total-for-reports X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=219dca1b00a60805545dd3de433de285cc944af5;p=akkoma Merge branch 'develop' into feature/return-total-for-reports --- 219dca1b00a60805545dd3de433de285cc944af5 diff --cc CHANGELOG.md index 942605f28,4eb72c002..584386136 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -19,10 -26,12 +26,13 @@@ The format is based on [Keep a Changelo - NodeInfo: Return `skipThreadContainment` in `metadata` for the `skip_thread_containment` option - NodeInfo: Return `mailerEnabled` in `metadata` - Mastodon API: Unsubscribe followers when they unfollow a user + - Mastodon API: `pleroma.thread_muted` key in the Status entity - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template - - Pagination: (optional) return `total` alongside with `items` when paginating + – Pagination: (optional) return `total` alongside with `items` when paginating + - 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 ### Fixed - Following from Osada