From: feld <feld@feld.me>
Date: Wed, 11 Mar 2020 16:53:05 +0000 (+0000)
Subject: Merge branch 'fix/signup-without-email' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2019f3b3ff365b61c14f01c736a6dcb68cb36624;hp=-c;p=akkoma

Merge branch 'fix/signup-without-email' into 'develop'

Allow account registration without an email

See merge request pleroma/pleroma!2246
---

2019f3b3ff365b61c14f01c736a6dcb68cb36624
diff --combined CHANGELOG.md
index 59f7dfcdd,462c7c2a3..100228c6c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,7 -3,7 +3,7 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
 -## [Unreleased]
 +## [2.0.0] - 2019-03-08
  ### Security
  - Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
  
@@@ -38,8 -38,8 +38,9 @@@
  - Rate limiter is now disabled for localhost/socket (unless remoteip plug is enabled)
  - Logger: default log level changed from `warn` to `info`.
  - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
+ - Allow account registration without an email
  - Default to `prepare: :unnamed` in the database configuration.
 +- Instance stats are now loaded on startup instead of being empty until next hourly job.
  <details>
    <summary>API Changes</summary>
  
@@@ -150,43 -150,6 +151,43 @@@
  - Mastodon API: Marking a conversation as read (`POST /api/v1/conversations/:id/read`) now no longer brings it to the top in the user's direct conversation list
  </details>
  
 +## [1.1.9] - 2020-02-10
 +### Fixed
 +- OTP: Inability to set the upload limit (again)
 +- Not being able to pin polls
 +- Streaming API: incorrect handling of reblog mutes
 +- Rejecting the user when field length limit is exceeded
 +- OpenGraph provider: html entities in descriptions
 +
 +## [1.1.8] - 2020-01-10
 +### Fixed
 +- Captcha generation issues
 +- Returned Kocaptcha endpoint to configuration
 +- Captcha validity is now 5 minutes
 +
 +## [1.1.7] - 2019-12-13
 +### Fixed
 +- OTP: Inability to set the upload limit
 +- OTP: Inability to override node name/distribution type to run 2 Pleroma instances on the same machine
 +
 +### Added
 +- Integrated captcha provider
 +
 +### Changed
 +- Captcha enabled by default
 +- Default Captcha provider changed from `Pleroma.Captcha.Kocaptcha` to `Pleroma.Captcha.Native`
 +- Better `Cache-Control` header for static content
 +
 +### Bundled Pleroma-FE Changes
 +#### Added
 +- Icons in the navigation panel
 +
 +#### Fixed
 +- Improved support unauthenticated view of private instances
 +
 +#### Removed
 +- Whitespace hack on empty post content
 +
  ## [1.1.6] - 2019-11-19
  ### Fixed
  - Not being able to log into to third party apps when the browser is logged into mastofe