Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
f0c316e7
Commit
f0c316e7
authored
Jun 25, 2020
by
Carsten Rose
Browse files
Merge branch 'master' into B10641TypeAheadTagFehlerBeimAnlegenMehrererTags
parents
89ebf650
cc75c271
Pipeline
#3565
passed with stages
in 4 minutes and 3 seconds
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
f0c316e7
...
...
@@ -72,3 +72,4 @@ composer.lock
/docker/chromedriver
/docker/geckodriver
/docker/run_qfq_docker.output
package-lock.json
CHANGELOG.md
View file @
f0c316e7
...
...
@@ -36,6 +36,17 @@ Features
Bug Fixes
^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
*
#10778 / Upload ZIP and unpack
Version 20.6.0
--------------
...
...
@@ -48,6 +59,7 @@ Notes
in filenames and wkhtml commandline options (like header/footer).
*
Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated
in individual files.
*
For the image to PDF feature, installation of
`img2pdf`
is required (please check
`preparation`
_).
Features
^^^^^^^^
...
...
Documentation-develop/NewVersion.md
View file @
f0c316e7
...
...
@@ -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 20.6.
0
**Auto**
: ./setVersion.sh 20.6.
1
Manuell:
*
extension/Documentation/_make/conf.py: release, version-
...
...
@@ -60,12 +60,12 @@ Neue Versionsnummer
*
Update the version number in this document (topic 6)
*
Commit & Push new version changes to master branch:
New version 20.6.
0
New version 20.6.
1
7)
**New Tag**
:
git tag v20.6.
0
git push -u origin v20.6.
0
git tag v20.6.
1
git push -u origin v20.6.
1
8)
**Merge 'master' into 'develop'**
...
...
Documentation-develop/SETUP.md
0 → 100644
View file @
f0c316e7
QFQ Development Setup
=================
Requirements
============
*
Node.js
*
PHP7.x - for local testing
*
Python
*
IDE (Used: PhpStorm, VSCode)
Mac OS X
--------
To be able to install various unix tools that are used, it is recommended to install homebrew from https://brew.sh
Afterwards use:
```
brew install php@7.2 wget```
VSCode
------
It is recommended to install the standard PHP, Python and Javascript plugins (Can be selected at the start).
Additional useful Extensions:
* `Tasks Panel` - allows you to start Grunt Tasks.
* `Beautify` - Opinionated Javascript Code beautifier.
* `JSLint` - Javascript Linting for old Ecma Script.
* `PHP Debug` - Support for PHP XDebug
* `PHP IntelliSense` - Advanced Autocompletion and Refactoring for PHP
* `PHP Intelephense` - Similar features to PHPStorm (has additional premium functionality)
Preparations
------------
You can use the command `make bootstrap` from the root folder of the git QFQ project to setup your Development Enviroment.
Or run:
```
sudo npm install grunt-cli -g
npm install
grunt default
```
manually from the root directory of the git QFQ project.
Working with Mockups
--------------------
Mockups are in the `mockup` directory.
To access them, you need a locally running webserver. The easiest way is to use the local webserver provided by php.
`php -S localhost:8000`
Now you can access the mockups by going to http://localhost:8000/mockup/qfqform.html
Documentation/Release.rst
View file @
f0c316e7
...
...
@@ -36,6 +36,17 @@ Features
Bug Fixes
^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
* #10778 / Upload ZIP and unpack
Version 20.6.0
--------------
...
...
Documentation/Settings.cfg
View file @
f0c316e7
...
...
@@ -22,7 +22,7 @@
project = QFQ - Quick Form Query
version = 20.6
release = 20.6.
0
release = 20.6.
1
t3author = Carsten Rose
copyright = since 2017 by the author
...
...
extension/RELEASE.txt
View file @
f0c316e7
...
...
@@ -36,6 +36,17 @@ Features
Bug Fixes
^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
* #10778 / Upload ZIP and unpack
Version 20.6.0
--------------
...
...
@@ -48,6 +59,7 @@ Notes
in filenames and wkhtml commandline options (like header/footer).
* Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated
in individual files.
* For the image to PDF feature, installation of `img2pdf` is required (please check `preparation`_).
Features
^^^^^^^^
...
...
extension/ext_emconf.php
View file @
f0c316e7
...
...
@@ -12,7 +12,7 @@ $EM_CONF[$_EXTKEY] = array(
'dependencies'
=>
'fluid,extbase'
,
'clearcacheonload'
=>
true
,
'state'
=>
'stable'
,
'version'
=>
'20.6.
0
'
,
'version'
=>
'20.6.
1
'
,
'constraints'
=>
[
'depends'
=>
[
'typo3'
=>
'7.0.0-9.2.99'
,
...
...
version
View file @
f0c316e7
20.6.
0
20.6.
1
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment