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.

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

[FEATURE] Add preview renderer #833

Merged
merged 8 commits into from
Oct 28, 2023

Conversation

brotkrueml
Copy link
Contributor

Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Thanks for the work you put into this, just some small remarks

@brotkrueml brotkrueml merged commit b704149 into TYPO3-Documentation:main Oct 28, 2023
1 check passed
@brotkrueml brotkrueml deleted the issue-781 branch October 28, 2023 08:41
@github-actions
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 120b979... [FEATURE] Add preview renderer
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging Documentation/Ctrl/Properties/Index.rst
CONFLICT (content): Merge conflict in Documentation/Ctrl/Properties/Index.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-833-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 120b979d78a578a1c54c2f49a21ceee22fece4a0,10a285159b85c59155edbc9416cc99784662411d,48f9669417912a7340ca36c0055f730f709a738f,aa9eebee3ab43bbd61efc609c83a82538a2bdd9a,e6b5aeaf5b4cbc2eb78904a59be1bf02c9d23357,470ce5d8b0d67d84fac9df03d0f56a7961454933,47d1e3590dd55ab637e63eebd794d88e67cacf77,7e2b2e75de31601a56b302e61872214d809f861a
# Push it to GitHub
git push --set-upstream origin backport-833-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-833-to-11.5.

@github-actions
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 128
stderr
error: commit e6b5aeaf5b4cbc2eb78904a59be1bf02c9d23357 is a merge but no -m option was given.
fatal: cherry-pick failed

stdout
[backport-833-to-12.4 b51b3da] [FEATURE] Add preview renderer
 Author: Chris Müller <[email protected]>
 Date: Sun Oct 22 16:17:49 2023 +0200
 2 files changed, 104 insertions(+), 45 deletions(-)
 create mode 100644 Documentation/Ctrl/Properties/PreviewRenderer.rst
[backport-833-to-12.4 98bb58b] Update Documentation/Ctrl/Properties/PreviewRenderer.rst
 Author: Chris Müller <[email protected]>
 Date: Sat Oct 28 10:12:19 2023 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
[backport-833-to-12.4 36a1df8] Use glob for collecting Ctrl/Properties
 Author: Chris Müller <[email protected]>
 Date: Sat Oct 28 10:22:37 2023 +0200
 1 file changed, 2 insertions(+), 43 deletions(-)
Auto-merging Documentation/Ctrl/Properties/PreviewRenderer.rst
[backport-833-to-12.4 b12649d] Adjust table name
 Author: Chris Müller <[email protected]>
 Date: Sat Oct 28 10:24:07 2023 +0200
 1 file changed, 5 insertions(+), 4 deletions(-)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-833-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 120b979d78a578a1c54c2f49a21ceee22fece4a0,10a285159b85c59155edbc9416cc99784662411d,48f9669417912a7340ca36c0055f730f709a738f,aa9eebee3ab43bbd61efc609c83a82538a2bdd9a,e6b5aeaf5b4cbc2eb78904a59be1bf02c9d23357,470ce5d8b0d67d84fac9df03d0f56a7961454933,47d1e3590dd55ab637e63eebd794d88e67cacf77,7e2b2e75de31601a56b302e61872214d809f861a
# Push it to GitHub
git push --set-upstream origin backport-833-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-833-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TCA that referenced this pull request Oct 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing "previewRenderer" documentation
2 participants