From: Maxim Filippov <colixer@gmail.com>
Date: Fri, 8 Nov 2019 09:30:49 +0000 (+0900)
Subject: Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b14bf9044fd99fe31dd6aa987d9fc535e3bc0218;p=akkoma

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

b14bf9044fd99fe31dd6aa987d9fc535e3bc0218
diff --cc CHANGELOG.md
index 64a28218d,b33d61819..8e03ee6b5
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -35,6 -39,6 +39,7 @@@ The format is based on [Keep a Changelo
  - Authentication: Added rate limit for password-authorized actions / login existence checks
  - Mix task to re-count statuses for all users (`mix pleroma.count_statuses`)
  - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
++- Admin API: Add ability to fetch reports, grouped by status `GET /api/pleroma/admin/grouped_reports`
  <details>
    <summary>API Changes</summary>
  
diff --cc docs/API/admin_api.md
index 9499d0140,c042b08ac..ce70b5122
--- a/docs/API/admin_api.md
+++ b/docs/API/admin_api.md
@@@ -381,17 -392,18 +381,18 @@@ Note: Available `:permission_group` is 
  }
  ```
  
- ## `PATCH /api/pleroma/admin/users/:nickname/force_password_reset`
 -## `/api/pleroma/admin/users/force_password_reset`
++## `PATCH /api/pleroma/admin/users/force_password_reset`
  
  ### Force passord reset for a user with a given nickname
  
- - Params: none
 -- Methods: `PATCH`
+ - Params:
+   - `nicknames`
  - Response: none (code `204`)
  
 -## `/api/pleroma/admin/reports`
 +## `GET /api/pleroma/admin/reports`
 +
  ### Get a list of reports
 -- Method `GET`
 +
  - Params:
    - *optional* `state`: **string** the state of reports. Valid values are `open`, `closed` and `resolved`
    - *optional* `limit`: **integer** the number of records to retrieve