Commit 095f0173 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into 'develop'

Master

See merge request !343
parents 4b255f75 5ee343b3
Pipeline #5201 passed with stages
in 3 minutes and 19 seconds
......@@ -13,12 +13,12 @@ stages:
- build
- selenium
documentation:
stage: before
script:
- docker pull t3docs/render-documentation
- source <(docker run --rm t3docs/render-documentation show-shell-commands)
- dockrun_t3rd makehtml
#documentation:
# stage: before
# script:
# - docker pull t3docs/render-documentation
# - source <(docker run --rm t3docs/render-documentation show-shell-commands)
# - dockrun_t3rd makehtml
snapshot:
stage: build
......
......@@ -52,6 +52,27 @@ Features
Bug Fixes
^^^^^^^^^
Version 21.5.0
--------------
Date: 02.05.2021
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
Version 21.4.0
--------------
......
......@@ -44,39 +44,35 @@ Neue Versionsnummer
**Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
**Auto**: ./setVersion.sh 21.4.0
**Auto**: ./setVersion.sh 21.5.0a
Manuell:
* extension/Documentation/_make/conf.py: release, version-
* Documentation/Settings.cfg: version
* extension/ext_emconf.php: version
5) **Documentation**
5) **Update Version & Commit**
make doc-local (dadurch fallen Fehler in der RESTdoc Syntax auf. TL: falls docker nicht laeuft: `chgrp docker /var/run/docker.sock; service docker restart` )
* **Commit & Push** to master branch:
New version 21.5.0a
6) **Update Version & Commit**
6) **New Tag**:
* Commit & Push new version changes to master branch:
git tag v21.5.0a
git push -u origin v21.5.0a
New version 21.4.0
7) **Merge 'master' into 'develop'**
7) **New Tag**:
git tag v21.4.0
git push -u origin v21.4.0
8) **Merge 'master' into 'develop'**
9) Tickets:
8) Tickets:
* Schliessen und der QFQ Version zuweisen.
* Aktuellen Milestone schliessen
10) QFQ Doc aktualisieren
9) QFQ Doc aktualisieren
Erfolgt implicit durch Commit in Branch Master & Develop.
11) Extension hochladen
10) Extension hochladen
TER: https://extensions.typo3.org/ > Log in > My Extensions.
......
......@@ -52,6 +52,28 @@ Features
Bug Fixes
^^^^^^^^^
Version 21.5.0
--------------
Date: 02.05.2021
Features
^^^^^^^^
* CodingGuideline.rst: add Form Best practice
Bug Fixes
^^^^^^^^^
* #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
--------------
......
......@@ -21,8 +21,8 @@
; you can use in 'conf.py'
project = QFQ - Quick Form Query
version = 21.4
release = 21.4.0
version = 21.5
release = 21.5.0a
t3author = Carsten Rose
copyright = since 2017 by the author
......
......@@ -62,9 +62,9 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger'
# built documents.
#
# The short X.Y version.
version = '21.4'
version = '21.5'
# The full version, including alpha/beta/rc tags.
release = '21.4.0'
release = '21.5.0a'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -52,6 +52,27 @@ Features
Bug Fixes
^^^^^^^^^
Version 21.5.0
--------------
Date: 02.05.2021
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
Version 21.4.0
--------------
......
......@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'stable',
'version' => '21.4.0',
'version' => '21.5.0a',
'constraints' => [
'depends' => [
'typo3' => '7.0.0-10.9.99',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment