pleroma

commit: 47efe52c50e6c9e237b2a81b9577b829445c3e3b
parent: 5f1dd4fe8006137f198ca09c72536d22ed472e24
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Mon,  1 Jul 2019 04:45:00 +0000

Merge branch 'chore/changelog-update' into 'develop'

Update changelog and admin API docs with tags, display_name, avatar additions

See merge request pleroma/pleroma!1367
Diffstat:
M
CHANGELOG.md
2
++
M
docs/api/admin_api.md
6
+++++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Admin API: Endpoints for managing reports
 - Admin API: Endpoints for deleting and changing the scope of individual reported statuses
 - Admin API: Endpoints to view and change config settings.
+- Admin API: Return users' tags when querying reports
+- Admin API: Return avatar and display name when querying users
 - AdminFE: initial release with basic user management accessible at /pleroma/admin/
 - Mastodon API: Add chat token to `verify_credentials` response
 - Mastodon API: Add background image setting to `update_credentials`
diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md
@@ -38,7 +38,9 @@ Authentication is required and the user must be an admin.
         "moderator": bool
       },
       "local": bool,
-      "tags": array
+      "tags": array,
+      "avatar": string,
+      "display_name": string
     },
     ...
   ]
@@ -331,6 +333,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
           "pleroma": {},
           "sensitive": false
         },
+        "tags": ["force_unlisted"],
         "statuses_count": 3,
         "url": "https://pleroma.example.org/users/user",
         "username": "user"
@@ -366,6 +369,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
           "pleroma": {},
           "sensitive": false
         },
+        "tags": ["force_unlisted"],
         "statuses_count": 1,
         "url": "https://pleroma.example.org/users/lain",
         "username": "lain"