Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] - fix creationDate sorting #98

Closed
wants to merge 7 commits into from
Closed

[BUGFIX] - fix creationDate sorting #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2504315
FEATURE: add own translation label for clipboard button
crydotsnake Aug 4, 2023
0f7ad76
declare compatibility to Neos 9
Aug 23, 2023
b7d69e4
Merge branch 'main' into neos9
ahaeslich Oct 11, 2023
203e234
TASK: Update dependencies
ahaeslich Oct 11, 2023
9decbe2
Merge pull request #97 from neos/neos9
ahaeslich Oct 13, 2023
62d0d71
Merge pull request #95 from crydotsnake/feature/translation-label-cop…
Sebobo Jan 10, 2024
3d4291a
[BUGFIX] - changed creation date time identifier in renderColumnHeade…
bielerj Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Private/JavaScript/components/RedirectList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ export class RedirectList extends React.Component<RedirectListProps, RedirectLis
<>
{this.renderColumnHeader('comment', 'Comment')}
{showHitCount && this.renderColumnHeader('hitCounter', 'Hits')}
{this.renderColumnHeader('creationDate', 'Created')}
{this.renderColumnHeader('creationDateTime', 'Created')}
{this.renderColumnHeader('creator', 'Creator')}
</>
)}
Expand Down
2 changes: 2 additions & 0 deletions Resources/Private/JavaScript/components/RedirectListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export class RedirectListItem extends React.PureComponent<RedirectListItemProps>
role="button"
className="copy-path"
onClick={() => handleCopyPathAction(redirect.sourceUriPath)}
title={translate('clipBoardCopyLabel', 'Copy')}
>
<Icon icon="clipboard" />
</span>
Expand All @@ -109,6 +110,7 @@ export class RedirectListItem extends React.PureComponent<RedirectListItemProps>
role="button"
className="copy-path"
onClick={() => handleCopyPathAction(redirect.targetUriPath)}
title={translate('clipBoardCopyLabel', 'Copy')}
>
<Icon icon="clipboard" />
</span>
Expand Down
4 changes: 4 additions & 0 deletions Resources/Private/Translations/de/Modules.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@
<source>The 451 HTTP status code shows that the requested content has been deleted because of legal reasons.</source>
<target>Der HTTP-Statuscode 451 zeigt an, dass der angeforderte Inhalt aus rechtlichen Gründen gelöscht wurde.</target>
</trans-unit>
<trans-unit id="clipBoardCopyLabel" xml:space="preserve">
<source>Copy</source>
<target>Kopieren</target>
</trans-unit>
</body>
</file>
</xliff>
4 changes: 4 additions & 0 deletions Resources/Private/Translations/en/Modules.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,10 @@
<trans-unit id="statusCodes.451.tooltip" xml:space="preserve">
<source>The 451 HTTP status code shows that the requested content has been deleted because of legal reasons.</source>
</trans-unit>
<trans-unit id="clipBoardCopyLabel" xml:space="preserve">
<source>Copy</source>
<target>Kopieren</target>
</trans-unit>
</body>
</file>
</xliff>
2 changes: 1 addition & 1 deletion Resources/Public/Assets/main.bundle.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Public/Assets/main.bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Public/Assets/main.bundle.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"webexcess/redirecthandler-backend": "*"
},
"require": {
"php": ">=7.4",
"neos/redirecthandler": "~5.0 || dev-main",
"neos/neos": "~7.3 || ~8.0 || dev-master",
"php": ">= 8.2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you based your change on the incorrect branch. Please make sure your commit is on top of the 2.x branch and not on the neos 9 branch.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll close this pull request and submit a new one with the proper base branch.

"neos/redirecthandler": "~6.0 || dev-main",
"neos/neos": "~9.0 || dev-master",
"ext-json": "*"
},
"autoload": {
Expand Down
Loading