From d51e5e447ee944e77646b15a7aabc0214e99c351 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Thu, 12 Sep 2019 20:38:57 +0300
Subject: Move emoji reloading to admin api

---
 docs/api/admin_api.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'docs/api/admin_api.md')

diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md
index 7637fa0d4..0377ea655 100644
--- a/docs/api/admin_api.md
+++ b/docs/api/admin_api.md
@@ -733,3 +733,10 @@ Compile time settings (need instance reboot):
   }
 ]
 ```
+
+## `POST /api/pleroma/admin/reload_emoji`
+### Reload the instance's custom emoji
+* Method `POST`
+* Authentication: required
+* Params: None
+* Response: JSON, "ok" and 200 status
-- 
cgit v1.2.3


From 6f25668215f7f9fe20bfaf3dd72e2262a6d8915e Mon Sep 17 00:00:00 2001
From: Maxim Filippov <colixer@gmail.com>
Date: Sun, 22 Sep 2019 16:08:07 +0300
Subject: Admin API: Add ability to force user's password reset

---
 docs/api/admin_api.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/api/admin_api.md')

diff --git a/docs/api/admin_api.md b/docs/api/admin_api.md
index 7637fa0d4..c6b9dd2b6 100644
--- a/docs/api/admin_api.md
+++ b/docs/api/admin_api.md
@@ -310,6 +310,14 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 - Params: none
 - Response: password reset token (base64 string)
 
+## `/api/pleroma/admin/users/:nickname/force_password_reset`
+
+### Force passord reset for a user with a given nickname
+
+- Methods: `PATCH`
+- Params: none
+- Response: none (code `204`)
+
 ## `/api/pleroma/admin/reports`
 ### Get a list of reports
 - Method `GET`
-- 
cgit v1.2.3