summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-07 12:40:45 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-07 12:40:45 -0500
commitcea44b6b3ebac3976699d2460ae53d8506b86445 (patch)
tree66ac637884dcc1c80b9632c40d90d273815a2d53 /CHANGELOG.md
parent20878c7f9913e1501821356f24e97c2c42b00a41 (diff)
parent745375bdcf2679ff803dd4ebc4a8313a7b5fb157 (diff)
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 150cd4147..61eeb0786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded.
- Return OAuth token `id` (primary key) in POST `/oauth/token`.
+### Fixed
+- Don't crash so hard when email settings are invalid.
+
## Unreleased (Patch)
### Fixed
@@ -26,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- User login failures if their `notification_settings` were in a NULL state.
- Mix task `pleroma.user delete_activities` query transaction timeout is now :infinity
- MRF (`SimplePolicy`): Embedded objects are now checked. If any embedded object would be rejected, its parent is rejected. This fixes Announces leaking posts from blocked domains.
+- Fixed some Markdown issues, including trailing slash in links.
## [2.3.0] - 2020-03-01