Skip to content

[TASK] Unify Screenshot inclusion#241

Merged
linawolf merged 1 commit intomainfrom
task/screen
Jan 20, 2026
Merged

[TASK] Unify Screenshot inclusion#241
linawolf merged 1 commit intomainfrom
task/screen

Conversation

@linawolf
Copy link
Copy Markdown
Member

Allow zoom in lightbox or gallery where helpful, remove borders

Releases: main, 13.4

Allow zoom in lightbox or gallery where helpful, remove borders

Releases: main, 13.4
@linawolf linawolf merged commit e0db3c7 into main Jan 20, 2026
3 checks passed
@linawolf linawolf deleted the task/screen branch January 20, 2026 12:11
@github-actions
Copy link
Copy Markdown

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply fd9f0c6... [TASK] Unify Screenshot inclusion
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".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/AccessControl/Login/Index.rst
Auto-merging Documentation/Concepts/Cache.rst
Auto-merging Documentation/ContentElements/ContactForm/Index.rst
Auto-merging Documentation/ContentElements/Content/Index.rst
CONFLICT (content): Merge conflict in Documentation/ContentElements/Content/Index.rst
Auto-merging Documentation/ContentElements/CreatingContent/Index.rst
CONFLICT (content): Merge conflict in Documentation/ContentElements/CreatingContent/Index.rst
Auto-merging Documentation/ContentElements/Images/Index.rst
CONFLICT (content): Merge conflict in Documentation/ContentElements/Images/Index.rst
Auto-merging Documentation/HelpInside/InternalNotes/Index.rst
CONFLICT (content): Merge conflict in Documentation/HelpInside/InternalNotes/Index.rst
Auto-merging Documentation/Images/AutomaticScreenshots/FilelistModule/ContextMenu.rst.txt
Auto-merging Documentation/Images/AutomaticScreenshots/FilelistModule/FileClipboard.rst.txt
Auto-merging Documentation/Images/AutomaticScreenshots/FilelistModule/FileUpload.rst.txt
Auto-merging Documentation/Images/AutomaticScreenshots/FilelistModule/FilelistModule.rst.txt
Auto-merging Documentation/Languages/Index.rst
CONFLICT (content): Merge conflict in Documentation/Languages/Index.rst
Auto-merging Documentation/ListModule/AdvancedClipboard/Index.rst
Auto-merging Documentation/ListModule/CopyPaste/Index.rst
CONFLICT (content): Merge conflict in Documentation/ListModule/CopyPaste/Index.rst
Auto-merging Documentation/ListModule/MassEditing/Index.rst
CONFLICT (content): Merge conflict in Documentation/ListModule/MassEditing/Index.rst
Auto-merging Documentation/ListModule/UsingEffectively/Index.rst
CONFLICT (content): Merge conflict in Documentation/ListModule/UsingEffectively/Index.rst
Auto-merging Documentation/Pages/CreatingPages/Index.rst
Auto-merging Documentation/Pages/WorkingWithPages/Index.rst
CONFLICT (content): Merge conflict in Documentation/Pages/WorkingWithPages/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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-241-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fd9f0c62ba67618965c8c5500226052ce63de5a9
# Push it to GitHub
git push --set-upstream origin backport-241-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

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

linawolf added a commit that referenced this pull request Jan 20, 2026
Allow zoom in lightbox or gallery where helpful, remove borders

Releases: main, 13.4

(cherry picked from commit e0db3c7)
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.

1 participant