From: feld <feld@feld.me>
Date: Thu, 14 Nov 2019 13:35:41 +0000 (+0000)
Subject: Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1afeaf82fa3f1718233f5012f851912f87f35a88;p=akkoma

Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'

Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
---

1afeaf82fa3f1718233f5012f851912f87f35a88
diff --cc CHANGELOG.md
index e04b96281,772bd34e9..b4ad91b0d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -53,10 -54,11 +55,12 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
  - OAuth: support for hierarchical permissions / [Mastodon 2.4.3 OAuth permissions](https://docs.joinmastodon.org/api/permissions/)
  - Metadata Link: Atom syndication Feed
 +- Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
  - 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: Multiple endpoints now require `nicknames` array, instead of singe `nickname`:
+   - `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`
+   - `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
  - Mastodon API: Add `/api/v1/markers` for managing timeline read markers