diff --git a/CHANGELOG.md b/CHANGELOG.md
index 838a6c9403fc38c6b4ba07446789585826c7d413..0ffd8bdbac54be4c7c44281daa43a827be185155 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,34 +43,51 @@ Version 21.x.x
Date: <date>
-Notes
-^^^^^
+Notes ^^^^^
-Features
-^^^^^^^^
+Features ^^^^^^^^
-Bug Fixes
-^^^^^^^^^
+Bug Fixes ^^^^^^^^^
+
+Version 21.5.1
+--------------
+
+Date: 17.05.2021
+
+Notes ^^^^^
+
+* The `log` directory was moved into the `qfqProject` directory in version 21.2.0 for new installations. But if the
+ directory `fileadmin/protected/log` already exists then QFQ keeps storing logs there. This was added to release notes
+ of 21.2.0 in hindsight.
+
+Features ^^^^^^^^
+
+* # 12183 / Download table as csv
+* # 12159 / Make url paths absolute (relative to baseUrl)
+
+Bug Fixes ^^^^^^^^^
+
+* # 12516 / Password Hashing Exception
Version 21.5.0
--------------
Date: 02.05.2021
-Features
-^^^^^^^^
+Features ^^^^^^^^
* CodingGuideline.rst: add Form Best practice
Bug Fixes
^^^^^^^^^
-* #10505 / Drag'n'Drop broken on Multi DB Instance - all checks done
-* #12475 / During QFQ update take care that all system tables exist.
-* #12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags
-* #12352 / Form As Json: copy via JSON in FormEditor broken.
-* #12398 / Fix check required for uploads
-* #10754 / Clean up stale requirements.txt
+* # 10505 / Drag'n'Drop broken on Multi DB Instance - all checks done
+* # 10754 / Clean up stale requirements.txt
+* # 11769 / Missing description table in Form.rst
+* # 12352 / Form As Json: copy via JSON in FormEditor broken.
+* # 12398 / Fix check required for uploads
+* # 12475 / During QFQ update take care that all system tables exist.
+* # 12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags
Version 21.4.0
@@ -189,13 +206,17 @@ Date: 01.02.2021
Notes
^^^^^
+* The `log` directory was moved into the `qfqProject` directory in version 21.2.0 for new installations. But if the
+ directory `fileadmin/protected/log` already exists then QFQ keeps storing logs there. This was added to release notes
+ of 21.2.0 in hindsight.
Features
^^^^^^^^
* #10286 / Download Links: Glyphicon selbst wählen/ausblenden
* #11878 / Purge extension option config.documentation
-* #6793 / Source files for ZIP archives might now specified with a path/filename how they are called inside the ZIP.
+* # 6793 / Source files for ZIP archives might now specified with a path/filename how they are called inside the ZIP.
+* log directory was moved into qfqProject directory
Bug Fixes
^^^^^^^^^
diff --git a/Documentation-develop/NewVersion.md b/Documentation-develop/NewVersion.md
index fdebb37d0042fa8c2323524e994c26cfdd09794f..d81a07f40a1379b2df7dcb6503d8bbdc4183db9f 100644
--- a/Documentation-develop/NewVersion.md
+++ b/Documentation-develop/NewVersion.md
@@ -42,9 +42,10 @@ Neue Versionsnummer
4) In folgenden Files anpassen:
- **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
+ **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie
+ TER nicht.
- **Auto**: ./setVersion.sh 21.5.0a
+ **Auto**: ./setVersion.sh 21.5.1
Manuell:
* extension/Documentation/_make/conf.py: release, version-
@@ -53,14 +54,13 @@ Neue Versionsnummer
5) **Update Version & Commit**
- * **Commit & Push** to master branch:
-
- New version 21.5.0a
+ * **Commit & Push** to master branch:
+
+ New version 21.5.1
6) **New Tag**:
- git tag v21.5.0a
- git push -u origin v21.5.0a
+ git tag v21.5.1 git push -u origin v21.5.1
7) **Merge 'master' into 'develop'**
diff --git a/Documentation/Release.rst b/Documentation/Release.rst
index b3cf1f2f49862c94aa3e3be9555ef2c669f0968e..f7b2b57712b5402efac8985de1f3475177add76d 100644
--- a/Documentation/Release.rst
+++ b/Documentation/Release.rst
@@ -52,10 +52,10 @@ Features
Bug Fixes
^^^^^^^^^
-Version 21.y.y
+Version 21.5.1
--------------
-Date: <date>
+Date: 17.05.2021
Notes
^^^^^
@@ -67,9 +67,14 @@ Notes
Features
^^^^^^^^
+* #12183 / Download table as csv
+* #12159 / Make url paths absolute (relative to baseUrl)
+
Bug Fixes
^^^^^^^^^
+* #12516 / Password Hashing Exception
+
Version 21.5.0
--------------
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 73f821b2bf22e84c3138d6f2c89adb4686cbdb71..eee166ac690d9a63c6558c2cb899d8fc30c238f0 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -22,7 +22,7 @@
project = QFQ - Quick Form Query
version = 21.5
-release = 21.5.0a
+release = 21.5.1
t3author = Carsten Rose
copyright = since 2017 by the author
diff --git a/Documentation/conf.py b/Documentation/conf.py
index f20a15134244ea288145df4427b3405971c7df85..b27c093d8f1b50f07edfd444c0c504920ced1342 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -64,7 +64,7 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger'
# The short X.Y version.
version = '21.5'
# The full version, including alpha/beta/rc tags.
-release = '21.5.0a'
+release = '21.5.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/extension/RELEASE.txt b/extension/RELEASE.txt
index 838a6c9403fc38c6b4ba07446789585826c7d413..f7b2b57712b5402efac8985de1f3475177add76d 100644
--- a/extension/RELEASE.txt
+++ b/extension/RELEASE.txt
@@ -52,6 +52,29 @@ Features
Bug Fixes
^^^^^^^^^
+Version 21.5.1
+--------------
+
+Date: 17.05.2021
+
+Notes
+^^^^^
+
+* The `log` directory was moved into the `qfqProject` directory in version 21.2.0 for new installations. But if the
+ directory `fileadmin/protected/log` already exists then QFQ keeps storing logs there. This was added to release notes
+ of 21.2.0 in hindsight.
+
+Features
+^^^^^^^^
+
+* #12183 / Download table as csv
+* #12159 / Make url paths absolute (relative to baseUrl)
+
+Bug Fixes
+^^^^^^^^^
+
+* #12516 / Password Hashing Exception
+
Version 21.5.0
--------------
@@ -66,11 +89,12 @@ Bug Fixes
^^^^^^^^^
* #10505 / Drag'n'Drop broken on Multi DB Instance - all checks done
-* #12475 / During QFQ update take care that all system tables exist.
-* #12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags
+* #10754 / Clean up stale requirements.txt
+* #11769 / Missing description table in Form.rst
* #12352 / Form As Json: copy via JSON in FormEditor broken.
* #12398 / Fix check required for uploads
-* #10754 / Clean up stale requirements.txt
+* #12475 / During QFQ update take care that all system tables exist.
+* #12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags
Version 21.4.0
@@ -189,6 +213,9 @@ Date: 01.02.2021
Notes
^^^^^
+* The `log` directory was moved into the `qfqProject` directory in version 21.2.0 for new installations. But if the
+ directory `fileadmin/protected/log` already exists then QFQ keeps storing logs there. This was added to release notes
+ of 21.2.0 in hindsight.
Features
^^^^^^^^
@@ -196,6 +223,7 @@ Features
* #10286 / Download Links: Glyphicon selbst wählen/ausblenden
* #11878 / Purge extension option config.documentation
* #6793 / Source files for ZIP archives might now specified with a path/filename how they are called inside the ZIP.
+* log directory was moved into qfqProject directory
Bug Fixes
^^^^^^^^^
diff --git a/extension/ext_emconf.php b/extension/ext_emconf.php
index ccc05f9d6447d454ef42e4e38e86b413a746704b..9780bda8da068553e0799d877f35fd00299db4b3 100644
--- a/extension/ext_emconf.php
+++ b/extension/ext_emconf.php
@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'stable',
- 'version' => '21.5.0a',
+ 'version' => '21.5.1',
'constraints' => [
'depends' => [
'typo3' => '7.0.0-10.9.99',
diff --git a/version b/version
index 43ced277a3f8e22f5d20e0ff089917899c16d419..9fee55d4434bc31642ea58aca0806347183bc129 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-21.5.0a
+21.5.1