summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorminibikini <egor@kislitsyn.com>2020-10-30 11:18:55 +0000
committerminibikini <egor@kislitsyn.com>2020-10-30 11:18:55 +0000
commit1cc8e945064319014300de5880a326d1100bf43e (patch)
tree938600cf0605372a15fe0cd909f94c364e409c20 /CHANGELOG.md
parent8542d2efee86131350736a9be96713551e01f6ed (diff)
parent131f3219e6b895139c5647cd2050dd22adce7139 (diff)
downloadpleroma-1cc8e945064319014300de5880a326d1100bf43e.tar.gz
pleroma-1cc8e945064319014300de5880a326d1100bf43e.zip
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2f536da8..d9410ccf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: Importing the mutes users from CSV files.
- Experimental websocket-based federation between Pleroma instances.
- Support for local-only statuses
+- Support pagination of blocks and mutes
- App metrics: ability to restrict access to specified IP whitelist.
- Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
@@ -37,6 +38,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Pleroma API: Importing the mutes users from CSV files.
- Admin API: Importing emoji from a zip file
- Pleroma API: Pagination for remote/local packs and emoji.
+- Admin API: (`GET /api/pleroma/admin/users`) added filters user by `unconfirmed` status
+- Admin API: (`GET /api/pleroma/admin/users`) added filters user by `actor_type`
</details>