Merge branch 'master' into 'develop'

Master

See merge request !335

.gitlab-ci.yml

 before_script:
   - VERSION=`cat ./version`
   - RELDATE=`date '+%Y%m%d%H%M'`
-  - mkdir build || true
+  - mkdir -p build || true
   - echo "Host `hostname`, User `id`"
 
 variables:

CHANGELOG.md

@@ -52,6 +52,41 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.4.0
+--------------
+
+Date: 11.04.2021
+
+Notes
+^^^^^
+
+* The new introduced 'Form As File' Feature in QFQ Version  21.3.* has been disabled. Instead every form can be imported
+  and exported as JSON. The automatic import/export was not stable and a manual process promises less problems.
+
+Features
+^^^^^^^^
+
+* #12015 / useAdvancedFormEditor: disable form sync using feature flag
+* #12346 / Add new formJson.json to system forms
+* #12345 / Update documentation of special column formJson
+* REST.rst: small reformat.
+* Add Test copyToClipboard
+* HTTP Header: Add 'X-Api-Key'. Fix problem for token without argument name. Update doc.
+* Add margin to qfq-badge
+* Fix undefined clearMe
+
+Bug Fixes
+^^^^^^^^^
+
+* #12341 / FormSubmitLog also saves FormName (not only FormId)
+* #11265 / Dropdown Menu: wrap with <p> breaks dropdown
+* #12268 / Enhanced FormSubmitLog Page Sample Code
+* gitlab-ci.yml: `mkdir -p ... ` suppresses warning if directory already exist. Add more descriptive message.
+* docker/run_qfq_docker.sh: 'source' eines files, das nicht existiert, gibt immer einen Fehler auf stdout.
+* Fix problem: /var/www/html/my/typo3conf/ext/qfq/Classes/Core/Form/FormAction.php / Line: 394 / Undefined index: saveFormJson
+* extension/Classes/Core/Helper/SessionCookie.php: Index 'host' was empty
+
+
 Version 21.3.2
 --------------
 

Documentation-develop/NewVersion.md

@@ -44,7 +44,7 @@ Neue Versionsnummer
 
    **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
 
-   **Auto**: ./setVersion.sh 21.3.2
+   **Auto**: ./setVersion.sh 21.4.0
 
    Manuell:
      * extension/Documentation/_make/conf.py: release, version-
@@ -59,12 +59,12 @@ Neue Versionsnummer
 
    * Commit & Push new version changes to master branch:
 
-     New version 21.3.2
+     New version 21.4.0
 
 7) **New Tag**:
 
-   git tag v21.3.2
-   git push -u origin v21.3.2
+   git tag v21.4.0
+   git push -u origin v21.4.0
 
 8) **Merge 'master' into 'develop'**
 

Documentation/Release.rst

@@ -52,6 +52,41 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.4.0
+--------------
+
+Date: 11.04.2021
+
+Notes
+^^^^^
+
+* The new introduced 'Form As File' Feature in QFQ Version  21.3.* has been disabled. Instead every form can be imported
+  and exported as JSON. The automatic import/export was not stable and a manual process promises less problems.
+
+Features
+^^^^^^^^
+
+* #12015 / useAdvancedFormEditor: disable form sync using feature flag
+* #12346 / Add new formJson.json to system forms
+* #12345 / Update documentation of special column formJson
+* REST.rst: small reformat.
+* Add Test copyToClipboard
+* HTTP Header: Add 'X-Api-Key'. Fix problem for token without argument name. Update doc.
+* Add margin to qfq-badge
+* Fix undefined clearMe
+
+Bug Fixes
+^^^^^^^^^
+
+* #12341 / FormSubmitLog also saves FormName (not only FormId)
+* #11265 / Dropdown Menu: wrap with <p> breaks dropdown
+* #12268 / Enhanced FormSubmitLog Page Sample Code
+* gitlab-ci.yml: `mkdir -p ... ` suppresses warning if directory already exist. Add more descriptive message.
+* docker/run_qfq_docker.sh: 'source' eines files, das nicht existiert, gibt immer einen Fehler auf stdout.
+* Fix problem: /var/www/html/my/typo3conf/ext/qfq/Classes/Core/Form/FormAction.php / Line: 394 / Undefined index: saveFormJson
+* extension/Classes/Core/Helper/SessionCookie.php: Index 'host' was empty
+
+
 Version 21.3.2
 --------------
 

Documentation/Settings.cfg

@@ -21,8 +21,8 @@
 ; you can use in 'conf.py'
 
 project = QFQ - Quick Form Query
-version = 21.3
-release = 21.3.2
+version = 21.4
+release = 21.4.0
 t3author = Carsten Rose
 copyright = since 2017 by the author
 

Documentation/conf.py

@@ -62,9 +62,9 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger'
 # built documents.
 #
 # The short X.Y version.
-version = '21.3'
+version = '21.4'
 # The full version, including alpha/beta/rc tags.
-release = '21.3.2'
+release = '21.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docker/run_qfq_docker.sh

@@ -35,7 +35,7 @@ T3_PORT=0    # if set to 0 choose random
 ##            Pre Process             ##
 ########################################
 
-source run_qfq_docker.output && echo "File run_qfq_docker.output already exists. Delete it first. Abort." \
+test -r run_qfq_docker.output && echo "File run_qfq_docker.output already exists. Delete it first. Abort." \
     && exit 1 || true
 
 
@@ -77,7 +77,7 @@ do
         echo "Timeout: could not connect to database."
         exit 1;
     fi
-    echo "Try again"
+    echo "Try up to 60 seonds until MySQL is available"
     sleep 1
 done
 
@@ -162,4 +162,4 @@ fi
 ########################################
 
 echo "Finished. Go to:"
-echo "localhost:${T3_PORT}"
\ No newline at end of file
+echo "localhost:${T3_PORT}"

extension/RELEASE.txt

@@ -52,6 +52,41 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 21.4.0
+--------------
+
+Date: 11.04.2021
+
+Notes
+^^^^^
+
+* The new introduced 'Form As File' Feature in QFQ Version  21.3.* has been disabled. Instead every form can be imported
+  and exported as JSON. The automatic import/export was not stable and a manual process promises less problems.
+
+Features
+^^^^^^^^
+
+* #12015 / useAdvancedFormEditor: disable form sync using feature flag
+* #12346 / Add new formJson.json to system forms
+* #12345 / Update documentation of special column formJson
+* REST.rst: small reformat.
+* Add Test copyToClipboard
+* HTTP Header: Add 'X-Api-Key'. Fix problem for token without argument name. Update doc.
+* Add margin to qfq-badge
+* Fix undefined clearMe
+
+Bug Fixes
+^^^^^^^^^
+
+* #12341 / FormSubmitLog also saves FormName (not only FormId)
+* #11265 / Dropdown Menu: wrap with <p> breaks dropdown
+* #12268 / Enhanced FormSubmitLog Page Sample Code
+* gitlab-ci.yml: `mkdir -p ... ` suppresses warning if directory already exist. Add more descriptive message.
+* docker/run_qfq_docker.sh: 'source' eines files, das nicht existiert, gibt immer einen Fehler auf stdout.
+* Fix problem: /var/www/html/my/typo3conf/ext/qfq/Classes/Core/Form/FormAction.php / Line: 394 / Undefined index: saveFormJson
+* extension/Classes/Core/Helper/SessionCookie.php: Index 'host' was empty
+
+
 Version 21.3.2
 --------------
 

extension/ext_emconf.php

@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
     'dependencies' => 'fluid,extbase',
     'clearcacheonload' => true,
     'state' => 'stable',
-    'version' => '21.3.2',
+    'version' => '21.4.0',
     'constraints' => [
         'depends' => [
             'typo3' => '7.0.0-10.9.99',

version

-21.3.2
+21.4.0