Commit afb006b7 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into 'develop'

Master

See merge request !351
parents af5b6fff 768c8a93
Pipeline #5266 passed with stages
in 3 minutes and 30 seconds
...@@ -43,34 +43,51 @@ Version 21.x.x ...@@ -43,34 +43,51 @@ Version 21.x.x
Date: <date> 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 Version 21.5.0
-------------- --------------
Date: 02.05.2021 Date: 02.05.2021
Features Features ^^^^^^^^
^^^^^^^^
* CodingGuideline.rst: add Form Best practice * CodingGuideline.rst: add Form Best practice
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
* #10505 / Drag'n'Drop broken on Multi DB Instance - all checks done * # 10505 / Drag'n'Drop broken on Multi DB Instance - all checks done
* #12475 / During QFQ update take care that all system tables exist. * # 10754 / Clean up stale requirements.txt
* #12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags * # 11769 / Missing description table in Form.rst
* #12352 / Form As Json: copy via JSON in FormEditor broken. * # 12352 / Form As Json: copy via JSON in FormEditor broken.
* #12398 / Fix check required for uploads * # 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 Version 21.4.0
...@@ -189,13 +206,17 @@ Date: 01.02.2021 ...@@ -189,13 +206,17 @@ Date: 01.02.2021
Notes 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 Features
^^^^^^^^ ^^^^^^^^
* #10286 / Download Links: Glyphicon selbst wählen/ausblenden * #10286 / Download Links: Glyphicon selbst wählen/ausblenden
* #11878 / Purge extension option config.documentation * #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 Bug Fixes
^^^^^^^^^ ^^^^^^^^^
......
...@@ -3214,7 +3214,7 @@ This example will display graphics instead of text 'add' and 'remove'. Also ther ...@@ -3214,7 +3214,7 @@ This example will display graphics instead of text 'add' and 'remove'. Also ther
tgClass = qfq-child-margin-top tgClass = qfq-child-margin-top
tgAddClass = btn alert-success tgAddClass = btn alert-success
tgAddText = <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> tgAddText = <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
tgRemoveClass = btn btn-danger alert-danger tgRemoveClass = btn alert-danger
tgRemoveText = <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> tgRemoveText = <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
Chart Chart
......
...@@ -253,14 +253,15 @@ Setup CSS & JS ...@@ -253,14 +253,15 @@ Setup CSS & JS
file10 = typo3conf/ext/qfq/Resources/Public/JavaScript/jquery.tablesorter.combined.min.js file10 = typo3conf/ext/qfq/Resources/Public/JavaScript/jquery.tablesorter.combined.min.js
file11 = typo3conf/ext/qfq/Resources/Public/JavaScript/jquery.tablesorter.pager.min.js file11 = typo3conf/ext/qfq/Resources/Public/JavaScript/jquery.tablesorter.pager.min.js
file12 = typo3conf/ext/qfq/Resources/Public/JavaScript/widget-columnSelector.min.js file12 = typo3conf/ext/qfq/Resources/Public/JavaScript/widget-columnSelector.min.js
file13 = typo3conf/ext/qfq/Resources/Public/JavaScript/widget-output.min.js
# Only needed in case FormElement 'annotate' is used. # Only needed in case FormElement 'annotate' is used.
file13 = typo3conf/ext/qfq/Resources/Public/JavaScript/fabric.min.js file14 = typo3conf/ext/qfq/Resources/Public/JavaScript/fabric.min.js
file14 = typo3conf/ext/qfq/Resources/Public/JavaScript/qfq.fabric.min.js file15 = typo3conf/ext/qfq/Resources/Public/JavaScript/qfq.fabric.min.js
# Only needed in case FullCalendar is used # Only needed in case FullCalendar is used
file15 = typo3conf/ext/qfq/Resources/Public/JavaScript/moment.min.js file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/moment.min.js
file16 = typo3conf/ext/qfq/Resources/Public/JavaScript/fullcalendar.min.js file17 = typo3conf/ext/qfq/Resources/Public/JavaScript/fullcalendar.min.js
} }
......
...@@ -52,10 +52,10 @@ Features ...@@ -52,10 +52,10 @@ Features
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
Version 21.y.y Version 21.5.1
-------------- --------------
Date: <date> Date: 17.05.2021
Notes Notes
^^^^^ ^^^^^
...@@ -67,9 +67,14 @@ Notes ...@@ -67,9 +67,14 @@ Notes
Features Features
^^^^^^^^ ^^^^^^^^
* #12183 / Download table as csv
* #12159 / Make url paths absolute (relative to baseUrl)
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
* #12516 / Password Hashing Exception
Version 21.5.0 Version 21.5.0
-------------- --------------
......
...@@ -2846,8 +2846,6 @@ The *tablesorter* options: ...@@ -2846,8 +2846,6 @@ The *tablesorter* options:
is shown. is shown.
* Class `tablesorter-column-selector` adds a column selector widget. * Class `tablesorter-column-selector` adds a column selector widget.
* Activate/Save/Delete `views`: Insert inside of a table html-tag the command:: * Activate/Save/Delete `views`: Insert inside of a table html-tag the command::
{{ '<uniqueName>' AS _tablesorter-view-saver }} {{ '<uniqueName>' AS _tablesorter-view-saver }}
...@@ -2879,6 +2877,22 @@ The *tablesorter* options: ...@@ -2879,6 +2877,22 @@ The *tablesorter* options:
* If there is a public view with the name 'Default' and a user has no choosen a view earlier, that one will be selected. * If there is a public view with the name 'Default' and a user has no choosen a view earlier, that one will be selected.
* You can export your tablesorter tables as CSV files using the output widget (be sure to include the separate JS file):
* Create a button to trigger the export with the following Javascript::
$('table.tablesorter').trigger('outputTable');
* Default export file name: `tableExport.csv`
* Exported with column separator `;`
* Only currently filtered rows are exported.
* Values are exported as text, without HTML tags
* You can change the formatting/value of each cell as follows::
<td data-name="12345">CHF 12,345.-</td>
* Headers and footers are exported as well.
Customization of tablesorter Customization of tablesorter
^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...@@ -2909,7 +2923,7 @@ Customization of tablesorter ...@@ -2909,7 +2923,7 @@ Customization of tablesorter
`data-tablesorter-config` on the table. `data-tablesorter-config` on the table.
Use JSON syntax when passing in your own configuration, such as: :: Use JSON syntax when passing in your own configuration, such as: ::
data-tablesorter-config='{"theme":"bootstrap","widthFixed":true,"headerTemplate":"{content} {icon}","dateFormat":"ddmmyyyy","widgets":["uitheme","filter","saveSort","columnSelector"],"widgetOptions":{"filter_columnFilters":true,"filter_reset":".reset","filter_cssFilter":"form-control","columnSelector_mediaquery":false} }' data-tablesorter-config='{"theme":"bootstrap","widthFixed":true,"headerTemplate":"{content} {icon}","dateFormat":"ddmmyyyy","widgets":["uitheme","filter","saveSort","columnSelector","output"],"widgetOptions":{"filter_columnFilters":true,"filter_reset":".reset","filter_cssFilter":"form-control","columnSelector_mediaquery":false,"output_delivery":"download","output_saveFileName":"tableExport.csv","output_separator":";"} }'
* If the above customization options are not enough, you can output your own HTML for the pager and/or column selector, * If the above customization options are not enough, you can output your own HTML for the pager and/or column selector,
as well as your own `$(document).ready()` function with the desired config. In this case, it is recommended not to as well as your own `$(document).ready()` function with the desired config. In this case, it is recommended not to
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
project = QFQ - Quick Form Query project = QFQ - Quick Form Query
version = 21.5 version = 21.5
release = 21.5.0a release = 21.5.1
t3author = Carsten Rose t3author = Carsten Rose
copyright = since 2017 by the author copyright = since 2017 by the author
......
...@@ -64,7 +64,7 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger' ...@@ -64,7 +64,7 @@ author = 'Carsten Rose, Benjamin Baer, Marc Egger'
# The short X.Y version. # The short X.Y version.
version = '21.5' version = '21.5'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -113,7 +113,8 @@ module.exports = function (grunt) { ...@@ -113,7 +113,8 @@ module.exports = function (grunt) {
src: [ src: [
'jquery.tablesorter.combined.min.js', 'jquery.tablesorter.combined.min.js',
'extras/jquery.tablesorter.pager.min.js', 'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-columnSelector.min.js' 'widgets/widget-columnSelector.min.js',
'widgets/widget-output.min.js'
], ],
expand: true, expand: true,
dest: typo3_js, dest: typo3_js,
...@@ -124,7 +125,8 @@ module.exports = function (grunt) { ...@@ -124,7 +125,8 @@ module.exports = function (grunt) {
src: [ src: [
'jquery.tablesorter.combined.min.js', 'jquery.tablesorter.combined.min.js',
'extras/jquery.tablesorter.pager.min.js', 'extras/jquery.tablesorter.pager.min.js',
'widgets/widget-columnSelector.min.js' 'widgets/widget-columnSelector.min.js',
'widgets/widget-output.min.js'
], ],
expand: true, expand: true,
dest: 'js/', dest: 'js/',
......
...@@ -52,6 +52,29 @@ Features ...@@ -52,6 +52,29 @@ 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 Version 21.5.0
-------------- --------------
...@@ -66,11 +89,12 @@ Bug Fixes ...@@ -66,11 +89,12 @@ Bug Fixes
^^^^^^^^^ ^^^^^^^^^
* #10505 / Drag'n'Drop broken on Multi DB Instance - all checks done * #10505 / Drag'n'Drop broken on Multi DB Instance - all checks done
* #12475 / During QFQ update take care that all system tables exist. * #10754 / Clean up stale requirements.txt
* #12479 / Remove unwrap('p-tag') for TinyMCE - currently, this breaks regular consecutive <p> tags * #11769 / Missing description table in Form.rst
* #12352 / Form As Json: copy via JSON in FormEditor broken. * #12352 / Form As Json: copy via JSON in FormEditor broken.
* #12398 / Fix check required for uploads * #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 Version 21.4.0
...@@ -189,6 +213,9 @@ Date: 01.02.2021 ...@@ -189,6 +213,9 @@ Date: 01.02.2021
Notes 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 Features
^^^^^^^^ ^^^^^^^^
...@@ -196,6 +223,7 @@ Features ...@@ -196,6 +223,7 @@ Features
* #10286 / Download Links: Glyphicon selbst wählen/ausblenden * #10286 / Download Links: Glyphicon selbst wählen/ausblenden
* #11878 / Purge extension option config.documentation * #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 Bug Fixes
^^^^^^^^^ ^^^^^^^^^
......
...@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array( ...@@ -12,7 +12,7 @@ $EM_CONF['qfq'] = array(
'dependencies' => 'fluid,extbase', 'dependencies' => 'fluid,extbase',
'clearcacheonload' => true, 'clearcacheonload' => true,
'state' => 'stable', 'state' => 'stable',
'version' => '21.5.0a', 'version' => '21.5.1',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '7.0.0-10.9.99', 'typo3' => '7.0.0-10.9.99',
......
...@@ -32,12 +32,15 @@ var QfqNS = QfqNS || {}; ...@@ -32,12 +32,15 @@ var QfqNS = QfqNS || {};
widthFixed: true, widthFixed: true,
headerTemplate: "{content} {icon}", headerTemplate: "{content} {icon}",
dateFormat: "ddmmyyyy", dateFormat: "ddmmyyyy",
widgets: ["uitheme", "filter", "saveSort", "columnSelector"], widgets: ["uitheme", "filter", "saveSort", "columnSelector", "output"],
widgetOptions: { widgetOptions: {
filter_columnFilters: hasFilter, // turn filters on/off with true/false filter_columnFilters: hasFilter, // turn filters on/off with true/false
filter_reset: ".reset", filter_reset: ".reset",
filter_cssFilter: "form-control", filter_cssFilter: "form-control",
columnSelector_mediaquery: false columnSelector_mediaquery: false,
output_delivery: "download",
output_saveFileName: "tableExport.csv",
output_separator: ";"
} }; } };
} }
......
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