summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-11-19 19:35:44 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-11-19 19:35:44 +0300
commitb27d8f74370ad404a91b15fa1f51ea6162f35098 (patch)
tree470f5bd604cad39dcf5163d18be3be2a78bf20f6 /CHANGELOG.md
parente164c37139c4365d7d46a2a990b364ad26dfdbf7 (diff)
parentc8d11c306452ea36f5690ba1824434dc71bd9f95 (diff)
downloadpleroma-b27d8f74370ad404a91b15fa1f51ea6162f35098.tar.gz
pleroma-b27d8f74370ad404a91b15fa1f51ea6162f35098.zip
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6caed1123..fe9b2b4d1 100644
--- 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>
@@ -38,9 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
<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)
@@ -52,8 +52,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