Skip to content
This repository has been archived by the owner on May 4, 2021. It is now read-only.

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 2fd104c52059c3536066226911e3c5d730a37140
Author: cybercraft <info@cybercraft.de>
Date:   Mon Dec 10 12:04:04 2018 +0100

    [BUGFIX] Use correct configuration keys for documentation

    Change-Id: I79758237f08d3a6de17e51e23072ba758c454627
    Resolves: #85448
    Releases: master, 8-0
    Reviewed-on: https://review.typo3.org/59072
    Reviewed-by: Jo Hasenau <info@cybercraft.de>
    Tested-by: Jo Hasenau <info@cybercraft.de>

commit 2cbff4c21a745a72b4da7cc2c1442a6d6c69dfb3
Author: cybercraft <info@cybercraft.de>
Date:   Sun Dec 9 19:23:02 2018 +0100

    [TASK] Use official coding style

    Change-Id: Iec9e84c8ca63857dffd553dfedc3a9e156b708ce

commit a388ee714892cdbad9f481ae5a675aaf10b078b8
Merge: 1ac51ac 222b186
Author: Jo Hasenau <cybercraft.jh@googlemail.com>
Date:   Sun Dec 9 18:06:05 2018 +0000

    Merge branch 'cherry-pick-6a40631b' into '8-0'

    Merge branch '17-flexform-settings-are-empty-in-extbase-controller' into 'master'

    See merge request cybercraft.jh/gridelements!18

commit 222b186d357322caf2d72999b2a958cfa2869058
Author: Jo Hasenau <cybercraft.jh@googlemail.com>
Date:   Mon Dec 3 10:30:05 2018 +0000

    Merge branch '17-flexform-settings-are-empty-in-extbase-controller' into 'master'

    Resolve "Flexform settings are empty in extbase controller"

    Closes #17

    See merge request cybercraft.jh/gridelements!13

    (cherry picked from commit 6a40631b635a11037674ece0489a8d0bd8d9647f)

    9a8577ed [BUGFIX] Resolve flexforms for Gridelements only to avoid problems w other plugins

commit 1ac51ac2266e10502306e931a6fae7a3257f4164
Merge: 680eb83 4f8354e
Author: Jo Hasenau <cybercraft.jh@googlemail.com>
Date:   Sun Dec 9 18:05:00 2018 +0000

    Merge branch 'cherry-pick-96c8d738' into '8-0'

    Merge branch '4-refactor-flexform-handling' into 'master'

    See merge request cybercraft.jh/gridelements!17

commit 4f8354eab71ac20f7943344d57dea72ce5f3b50c
Author: Jo Hasenau <cybercraft.jh@googlemail.com>
Date:   Thu Nov 29 19:23:26 2018 +0000

    Merge branch '4-refactor-flexform-handling' into 'master'

    Resolve "Refactor Flexform handling"

    Closes #4

    See merge request cybercraft.jh/gridelements!11

    (cherry picked from commit 96c8d738bd6aefe6aec871e0add82d08f297504a)

    cb3d4e7c [TASK] Process flexform values of children directly after fetching them
    f5f9aa28 [BUGFIX] Assign first parameter too before assigning child data array
    e2cbfd20 [TASK] Unset cObjData as well

commit 680eb8382a3dc934e5fafb419ff91bfe8319bc5c
Merge: a0c901c d37232a
Author: Jo Hasenau <cybercraft.jh@googlemail.com>
Date:   Sun Dec 9 18:02:08 2018 +0000

    Merge branch 'cherry-pick-4b56ea64' into '8-0'

    [BUGFIX] Make sure children only expand when the whole rootline is

    See merge request cybercraft.jh/gridelements!16

commit d37232ae494a36b1efc422146eaef02a0bf9f577
Author: cybercraft <info@cybercraft.de>
Date:   Sun Dec 9 17:48:36 2018 +0000

    [BUGFIX] Make sure children only expand when the whole rootline is

    Change-Id: I665b18bc5c52da69ee60a9479f1d308789126a5f

    (cherry picked from commit 4b56ea6420e4259ae60c8c115f232f8b30a2069f)

Change-Id: I79b222a5195ce786771c39d8846f155cad2e8456
Reviewed-on: https://review.typo3.org/59075
Reviewed-by: Jo Hasenau <info@cybercraft.de>
Tested-by: Jo Hasenau <info@cybercraft.de>
  • Loading branch information
Bunnyfield committed Dec 10, 2018
1 parent aeb8685 commit fc44472
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Documentation/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Grid Elements
gridelements

:Version:
8.0.0
8.3.0

:Language:
en
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "gridelementsteam/gridelements",
"description": "This extension integrates the grid layout concept also to regular content elements - the grid elements. It offers a lot of new features like advanced drag & drop or real references, that improve the usability of the page and list module to speed up the daily work with the backend.",
"type": "typo3-cms-extension",
"version": "8.2.3",
"version": "8.3.0",
"keywords": ["TYPO3 CMS", "Grids", "Gridelements"],
"homepage": "https://forge.typo3.org/projects/extension-gridelements2",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'description' => 'This extension integrates the grid layout concept also to regular content elements - the grid elements.
It offers a lot of new features like advanced drag & drop or real references, that improve the usability of the page and list module to speed up the daily work with the backend.',
'category' => 'be',
'version' => '8.2.3',
'version' => '8.3.0',
'priority' => 'bottom',
'module' => '',
'state' => 'stable',
Expand Down

0 comments on commit fc44472

Please sign in to comment.