Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.3' into 9.0
Browse files Browse the repository at this point in the history
Marc Henry war hier
  • Loading branch information
mhsdesign committed May 14, 2024
2 parents 5232340 + c099e9f commit f57b9fc
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 14 deletions.
27 changes: 27 additions & 0 deletions Neos.Neos/Configuration/Settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,33 @@ Neos:
features:
upload: true
mediaBrowser: true
Neos\Media\Domain\Model\Audio:
typeConverter: Neos\Neos\TypeConverter\EntityToIdentityConverter
editor: Neos.Neos/Inspector/Editors/AssetEditor
editorOptions:
features:
upload: true
mediaBrowser: true
constraints:
mediaTypes:
- 'audio/*'
Neos\Media\Domain\Model\Document:
typeConverter: Neos\Neos\TypeConverter\EntityToIdentityConverter
editor: Neos.Neos/Inspector/Editors/AssetEditor
editorOptions:
features:
upload: true
mediaBrowser: true
Neos\Media\Domain\Model\Video:
typeConverter: Neos\Neos\TypeConverter\EntityToIdentityConverter
editor: Neos.Neos/Inspector/Editors/AssetEditor
editorOptions:
features:
upload: true
mediaBrowser: true
constraints:
mediaTypes:
- 'video/*'
array<Neos\Media\Domain\Model\Asset>:
typeConverter: Neos\Flow\Property\TypeConverter\TypedArrayConverter
editor: Neos.Neos/Inspector/Editors/AssetEditor
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/EelHelpersReference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Eel Helpers Reference
=====================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Eel Helpers Reference: Array`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FlowQuery Operation Reference
=============================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`FlowQuery Operation Reference: add`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Signals/Flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow Signals Reference
======================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Flow Signals Reference: AbstractAdvice (``Neos\Flow\Aop\Advice\AbstractAdvice``)`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Signals/Media.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Media Signals Reference
=======================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Media Signals Reference: AssetCollectionController (``Neos\Media\Browser\Controller\AssetCollectionController``)`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Signals/Neos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Neos Signals Reference
======================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Neos Signals Reference: AbstractModuleController (``Neos\Neos\Controller\Module\AbstractModuleController``)`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Validators/Flow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow Validator Reference
========================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Flow Validator Reference: AggregateBoundaryValidator`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Validators/Media.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Media Validator Reference
=========================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Media Validator Reference: ImageOrientationValidator`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/Validators/Party.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Party Validator Reference
=========================

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Party Validator Reference: AimAddressValidator`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Fusion ViewHelper Reference
###########################

This reference was automatically generated from code on 2024-04-19
This reference was automatically generated from code on 2024-05-14


.. _`Fusion ViewHelper Reference: fusion:render`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
<label class="neos-control-label" for="password[0]">{neos:backend.translate(id: 'password')}</label>
<div class="neos-controls">
<f:form.password name="password[0]" id="password[0]" class="neos-span12"/>
<f:form.password additionalAttributes="{autocomplete: 'new-password'}" name="password[0]" id="password[0]" class="neos-span12"/>
</div>
</div>

<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
<label class="neos-control-label" for="password[1]">{neos:backend.translate(source: 'Modules', id: 'users.repeatPassword')}</label>
<div class="neos-controls">
<f:form.password name="password[1]" id="password[1]" class="neos-span12"/>
<f:form.password additionalAttributes="{autocomplete: 'new-password'}" name="password[1]" id="password[1]" class="neos-span12"/>
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'password'}"/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
<div class="neos-control-group{f:validation.ifHasErrors(for: 'username', then: ' neos-error')}">
<label class="neos-control-label" for="username">{neos:backend.translate(id: 'users.new.userData.username', value: 'Username', source: 'Modules', package: 'Neos.Neos')}</label>
<div class="neos-controls">
<f:form.textfield name="username" id="username" class="neos-span12" autofocus="true" required="true" />
<f:form.textfield name="username" id="username" class="neos-span12" autofocus="true" required="true" additionalAttributes="{autocomplete: 'username'}" />
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'username'}"/>
</div>
</div>

<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
<label class="neos-control-label" for="password[0]">{neos:backend.translate(id: 'users.new.userData.password', value: 'Password', source: 'Modules', package: 'Neos.Neos')}</label>
<div class="neos-controls">
<f:form.password name="password[0]" id="password[0]" class="neos-span12" additionalAttributes="{required: true}" />
<f:form.password name="password[0]" id="password[0]" class="neos-span12" additionalAttributes="{required: true, autocomplete: 'new-password'}" />
</div>
</div>

<div class="neos-control-group{f:validation.ifHasErrors(for: 'password', then: ' neos-error')}">
<label class="neos-control-label" for="password[1]">{neos:backend.translate(id: 'users.new.userData.repeatPassword', value: 'Repeat password', source: 'Modules', package: 'Neos.Neos')}</label>
<div class="neos-controls">
<f:form.password name="password[1]" id="password[1]" class="neos-span12" additionalAttributes="{required: true}" />
<f:form.password name="password[1]" id="password[1]" class="neos-span12" additionalAttributes="{required: true, autocomplete: 'new-password'}" />
<f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'password'}"/>
</div>
</div>
Expand Down

0 comments on commit f57b9fc

Please sign in to comment.