Merge branch 'release-2.2' into 'master'

Do release 2.2

See merge request !105

CHANGELOG.rst

@@ -9,11 +9,19 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+`2.2`_ - 2022-06-23
+-------------------
+
 Added
 ~~~~~
 
 * Add Ukrainian locale (contributed by Sergiy Gorichenko from Fre(i)e Software GmbH).
 
+Fixed
+~~~~~
+
+* Remove preferences for the not yet available functionality to create LDAP users on register.
+
 `2.1`_ - 2022-01-21
 -------------------
 
@@ -110,3 +118,4 @@ Added
 .. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0
 .. _2.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0.1
 .. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.1
+.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.2

docs/conf.py

@@ -29,9 +29,9 @@ copyright = "2020-2022 The AlekSIS team"
 author = "The AlekSIS Team"
 
 # The short X.Y version
-version = "2.1"
+version = "2.2"
 # The full version, including alpha/beta/rc tags
-release = "2.1.1.dev0"
+release = "2.2.1.dev0"
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-LDAP"
-version = "2.1.1.dev0"
+version = "2.2.1.dev0"
 packages = [
     { include = "aleksis" }
 ]