summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-12-12 18:43:21 +0000
committerlain <lain@soykaf.club>2019-12-12 18:43:21 +0000
commit2f31cef71f377cf660f818e7e204436f2070bd78 (patch)
tree7c41977bdc6512918ec79073e94c4d362ea783bf /CHANGELOG.md
parent8ad6d2784c0b79a50346dfd45fe3f3c0997b3d06 (diff)
parent470a3a678dfb4a7b9c2fe29c6b7ea03cee35ee82 (diff)
downloadpleroma-2f31cef71f377cf660f818e7e204436f2070bd78.tar.gz
pleroma-2f31cef71f377cf660f818e7e204436f2070bd78.zip
Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37b8b0be7..c133cd9ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,6 +84,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- ActivityPub: Configurable `type` field of the actors.
- Mastodon API: `/api/v1/accounts/:id` has `source/pleroma/actor_type` field.
- Mastodon API: `/api/v1/update_credentials` accepts `actor_type` field.
+- Captcha: Support native provider
+- Captcha: Enable by default
</details>
### Fixed