Skip to content

Commit

Permalink
Merge branch '8.1' into 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bwaidelich committed Jun 5, 2023
2 parents c4679fc + e14a7b5 commit ef71052
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 0 deletions.
32 changes: 32 additions & 0 deletions Neos.Neos/Documentation/Appendixes/ChangeLogs/5314.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
`5.3.14 (2022-11-03) <https://github.com/neos/neos-development-collection/releases/tag/5.3.14>`_
================================================================================================

Overview of merged pull requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`TASK: Render API docs (again) <https://github.com/neos/neos-development-collection/pull/3934>`_
------------------------------------------------------------------------------------------------

* Packages: ``Browser`` ``github`` ``Neos``

`BUGFIX: Fusion Runtime lazy-props evaluation confuses \`getLastEvaluat… <https://github.com/neos/neos-development-collection/pull/3677>`_
--------------------------------------------------------------------------------------------------------------------------------------------

fixes: #3469

doing the check if a render was successful cannot only happen via `$this->getLastEvaluationStatus()`
-> as the render path might contain a lazy-prop (closure) which, when evaluated uses the same runtime.
-> if the last lazy-prop has an `@if` annotation its skipped, but the `$lastEvaluationStatus` is set on the same runtime.
-> there might still be partial successful output (the first values of a lazy-prop eg.) so we need to check additionally if the return value is null.

* Packages: ``Fusion``

`TASK: Adjust Neos.DocTools settings <https://github.com/neos/neos-development-collection/pull/3877>`_
------------------------------------------------------------------------------------------------------

See https://github.com/neos/doctools/pull/4

* Packages: ``Media`` ``Neos``

`Detailed log <https://github.com/neos/neos-development-collection/compare/5.3.13...5.3.14>`_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
55 changes: 55 additions & 0 deletions Neos.Neos/Documentation/Appendixes/ChangeLogs/7313.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
`7.3.13 (2023-05-30) <https://github.com/neos/neos-development-collection/releases/tag/7.3.13>`_
================================================================================================

Overview of merged pull requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`BUGFIX: Add translation keys in translation files <https://github.com/neos/neos-development-collection/pull/4237>`_
--------------------------------------------------------------------------------------------------------------------

The following translation keys are missing their translation in the Main.xlf file.

https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/index.js#L82
https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/NodeTreeToolBar/Buttons/ToggleContentTree/index.js#L39

* Packages: ``Neos``

`BUGFIX: Fix missing icon in case of fusion errors <https://github.com/neos/neos-development-collection/pull/4224>`_
--------------------------------------------------------------------------------------------------------------------

Change html class for icon which gets rendered if a fusion error occurs.

Closes `#4223 <https://github.com/neos/neos-development-collection/issues/4223>`_


* Packages: ``Neos`` ``Fusion``

`BUGFIX: make pagination work with Traversable <https://github.com/neos/neos-development-collection/pull/4220>`_
----------------------------------------------------------------------------------------------------------------

Fixes a warning: ``array_slice() expects parameter 1 to be array, object given in /…/Neos_ContentRepository_ViewHelpers_Widget_Controller_PaginateController.php line 124``

Variant of `#3891 <https://github.com/neos/neos-development-collection/pull/3891>`_ based on the (correct) 7.3 branch.

* See: `#1112 <https://github.com/neos/neos-development-collection/issues/1112>`_

* Packages: ``Neos`` ``ContentRepository``

`TASK: Require all collection packages as self.version <https://github.com/neos/neos-development-collection/pull/4258>`_
------------------------------------------------------------------------------------------------------------------------

Any dependency from one package in the collection to another should always be "to the same version".

This changes makes sure this is the case by using ``self.version`` as the required version.

See `#4257 <https://github.com/neos/neos-development-collection/issues/4257>`_

**Upgrade instructions**

**Review instructions**


* Packages: ``Neos`` ``CliSetup`` ``Fusion.Afx`` ``NodeTypes.AssetList`` ``NodeTypes.BaseMixins`` ``NodeTypes.ColumnLayouts`` ``NodeTypes.ContentReferences`` ``NodeTypes.Form`` ``NodeTypes.Html`` ``NodeTypes.Navigation``

`Detailed log <https://github.com/neos/neos-development-collection/compare/7.3.12...7.3.13>`_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
63 changes: 63 additions & 0 deletions Neos.Neos/Documentation/Appendixes/ChangeLogs/8010.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
`8.0.10 (2023-05-30) <https://github.com/neos/neos-development-collection/releases/tag/8.0.10>`_
================================================================================================

Overview of merged pull requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`BUGFIX: Add translation keys in translation files <https://github.com/neos/neos-development-collection/pull/4237>`_
--------------------------------------------------------------------------------------------------------------------

The following translation keys are missing their translation in the Main.xlf file.

https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/index.js#L82
https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/NodeTreeToolBar/Buttons/ToggleContentTree/index.js#L39

* Packages: ``Neos``

`BUGFIX: Fix missing icon in case of fusion errors <https://github.com/neos/neos-development-collection/pull/4224>`_
--------------------------------------------------------------------------------------------------------------------

Change html class for icon which gets rendered if a fusion error occurs.

Closes `#4223 <https://github.com/neos/neos-development-collection/issues/4223>`_


* Packages: ``Neos`` ``Fusion``

`BUGFIX: make pagination work with Traversable <https://github.com/neos/neos-development-collection/pull/4220>`_
----------------------------------------------------------------------------------------------------------------

Fixes a warning: ``array_slice() expects parameter 1 to be array, object given in /…/Neos_ContentRepository_ViewHelpers_Widget_Controller_PaginateController.php line 124``

Variant of `#3891 <https://github.com/neos/neos-development-collection/pull/3891>`_ based on the (correct) 7.3 branch.

* See: `#1112 <https://github.com/neos/neos-development-collection/issues/1112>`_

* Packages: ``Neos`` ``ContentRepository``

`BUGFIX: Adjust version and release variables <https://github.com/neos/neos-development-collection/pull/4207>`_
---------------------------------------------------------------------------------------------------------------

Without the change, the docs will render a wrong version information on the index page.

<img width="1108" alt="Screenshot 2023-04-23 at 21 16 52" src="https://user-images.githubusercontent.com/1014126/233860295-8da2a358-a3c8-420b-bee0-fd61ba1dec59.png">


* Packages: ``Neos``

`TASK: Require all collection packages as self.version <https://github.com/neos/neos-development-collection/pull/4258>`_
------------------------------------------------------------------------------------------------------------------------

Any dependency from one package in the collection to another should always be "to the same version".

This changes makes sure this is the case by using ``self.version`` as the required version.

See `#4257 <https://github.com/neos/neos-development-collection/issues/4257>`_

**Upgrade instructions**


* Packages: ``Neos`` ``CliSetup`` ``Fusion.Afx`` ``NodeTypes.AssetList`` ``NodeTypes.BaseMixins`` ``NodeTypes.ColumnLayouts`` ``NodeTypes.ContentReferences`` ``NodeTypes.Form`` ``NodeTypes.Html`` ``NodeTypes.Navigation``

`Detailed log <https://github.com/neos/neos-development-collection/compare/8.0.9...8.0.10>`_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
63 changes: 63 additions & 0 deletions Neos.Neos/Documentation/Appendixes/ChangeLogs/815.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
`8.1.5 (2023-05-30) <https://github.com/neos/neos-development-collection/releases/tag/8.1.5>`_
==============================================================================================

Overview of merged pull requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`BUGFIX: Add translation keys in translation files <https://github.com/neos/neos-development-collection/pull/4237>`_
--------------------------------------------------------------------------------------------------------------------

The following translation keys are missing their translation in the Main.xlf file.

https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/index.js#L82
https://github.com/neos/neos-ui/blob/7.3/packages/neos-ui/src/Containers/LeftSideBar/NodeTreeToolBar/Buttons/ToggleContentTree/index.js#L39

* Packages: ``Neos``

`BUGFIX: Fix missing icon in case of fusion errors <https://github.com/neos/neos-development-collection/pull/4224>`_
--------------------------------------------------------------------------------------------------------------------

Change html class for icon which gets rendered if a fusion error occurs.

Closes `#4223 <https://github.com/neos/neos-development-collection/issues/4223>`_


* Packages: ``Neos`` ``Fusion``

`BUGFIX: make pagination work with Traversable <https://github.com/neos/neos-development-collection/pull/4220>`_
----------------------------------------------------------------------------------------------------------------

Fixes a warning: ``array_slice() expects parameter 1 to be array, object given in /…/Neos_ContentRepository_ViewHelpers_Widget_Controller_PaginateController.php line 124``

Variant of `#3891 <https://github.com/neos/neos-development-collection/pull/3891>`_ based on the (correct) 7.3 branch.

* See: `#1112 <https://github.com/neos/neos-development-collection/issues/1112>`_

* Packages: ``Neos`` ``ContentRepository``

`BUGFIX: Adjust version and release variables <https://github.com/neos/neos-development-collection/pull/4207>`_
---------------------------------------------------------------------------------------------------------------

Without the change, the docs will render a wrong version information on the index page.

<img width="1108" alt="Screenshot 2023-04-23 at 21 16 52" src="https://user-images.githubusercontent.com/1014126/233860295-8da2a358-a3c8-420b-bee0-fd61ba1dec59.png">


* Packages: ``Neos``

`TASK: Require all collection packages as self.version <https://github.com/neos/neos-development-collection/pull/4258>`_
------------------------------------------------------------------------------------------------------------------------

Any dependency from one package in the collection to another should always be "to the same version".

This changes makes sure this is the case by using ``self.version`` as the required version.

See `#4257 <https://github.com/neos/neos-development-collection/issues/4257>`_

**Upgrade instructions**


* Packages: ``Neos`` ``CliSetup`` ``Fusion.Afx`` ``NodeTypes.AssetList`` ``NodeTypes.BaseMixins`` ``NodeTypes.ColumnLayouts`` ``NodeTypes.ContentReferences`` ``NodeTypes.Form`` ``NodeTypes.Html`` ``NodeTypes.Navigation``

`Detailed log <https://github.com/neos/neos-development-collection/compare/8.1.4...8.1.5>`_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8 changes: 8 additions & 0 deletions Neos.Neos/Resources/Private/Translations/es/Main.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,14 @@
<source>Content Tree</source>
<target state="translated">Árbol de contenidos</target>
</trans-unit>
<trans-unit id="documentTree" xml:space="preserve">
<source>Document Tree</source>
<target state="translated">Árbol de documentos</target>
</trans-unit>
<trans-unit id="contentTree" xml:space="preserve">
<source>Content Tree</source>
<target state="translated">Árbol de contenidos</target>
</trans-unit>
</body>
</file>
</xliff>
8 changes: 8 additions & 0 deletions Neos.Neos/Resources/Private/Translations/nl/Main.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,14 @@
<source>Content Tree</source>
<target state="translated">Contentboom</target>
</trans-unit>
<trans-unit id="documentTree" xml:space="preserve">
<source>Document Tree</source>
<target state="translated">Documentboom</target>
</trans-unit>
<trans-unit id="contentTree" xml:space="preserve">
<source>Content Tree</source>
<target state="translated">Contentboom</target>
</trans-unit>
</body>
</file>
</xliff>
20 changes: 20 additions & 0 deletions Neos.Neos/Resources/Private/Translations/pt/Main.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,26 @@ Apenas caracteres regulares (a a z, tremas, ...) e números são permitidos.</ta
<source>This is a shortcut to a specific target:</source>
<target state="needs-translation">Este é um atalho para um alvo específico:</target>
</trans-unit>
<trans-unit id="impersonate.success.impersonateUser" xml:space="preserve" approved="no">
<source>Switched to the new user "{0}".</source>
<target state="needs-translation">Alternado para o novo utilizador "{0}".</target>
</trans-unit>
<trans-unit id="impersonate.error.impersonateUser" xml:space="preserve" approved="no">
<source>Could not switch to the selected user.</source>
<target state="needs-translation">Não foi possível alternar para o utilizador selecionado.</target>
</trans-unit>
<trans-unit id="impersonate.error.restoreUser" xml:space="preserve" approved="no">
<source>Could not switch back to the original user.</source>
<target state="needs-translation">Não foi possível voltar ao utilizador original.</target>
</trans-unit>
<trans-unit id="impersonate.success.restoreUser" xml:space="preserve" approved="no">
<source>Switched back from "{0}" to the orginal user "{1}"</source>
<target state="needs-translation">Voltado de "{0}" ao utilizador original "{1}"</target>
</trans-unit>
<trans-unit id="impersonate.title.restoreUserButton" xml:space="preserve" approved="no">
<source>Switch back to the orginal user account</source>
<target state="needs-translation">Voltar à conta de utilizador original</target>
</trans-unit>
</body>
</file>
</xliff>

0 comments on commit ef71052

Please sign in to comment.