Merge branch '2317-old-reset-tokens' into 'develop'

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8658d544099f7bae38c731b891ba59870b0aa502..fc4013fc3358e766c0d6effb6843dfc8cc5e190c 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
 - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
 - The site title is now injected as a `title` tag like preloads or metadata.
+- Password reset tokens now are not accepted after a certain age.
 
 <details>
   <summary>API Changes</summary>
@@ -34,11 +35,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 
-<details>
+- <details>
   <summary>API Changes</summary>
-- Mastodon API: Current user is now included in conversation if it's the only participant.
-- Mastodon API: Fixed last_status.account being not filled with account data.
-
+  - Mastodon API: Current user is now included in conversation if it's the only participant.
+  - Mastodon API: Fixed last_status.account being not filled with account data.
 </details>
 
 ## Unreleased (Patch)
@@ -50,8 +50,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 
 - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
+- Search: RUM index search speed has been fixed.
 - S3 Uploads with Elixir 1.11.
-- Fixed Emoji Reaction activity filtering from blocked and muted accounts
+- Emoji Reaction activity filtering from blocked and muted accounts.
 - Mix task pleroma.user delete_activities for source installations.
 
 ## [2.2.0] - 2020-11-12