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

Jump to bottom

XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG #3102

Merged
merged 3 commits into from
May 6, 2024
Merged

XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG #3102

merged 3 commits into from
May 6, 2024

Conversation

manuelleduc
Copy link
Contributor

@manuelleduc manuelleduc commented May 6, 2024 •
edited

Jira URL

https://jira.xwiki.org/browse/XWIKI-22146

Changes

Description

  • It is now possible to paste/drag-n-drop images

Executed Tests

mvn clean install -Pquality,integration-tests,docker \
  -pl :xwiki-platform-ckeditor-plugins -amd -f xwiki-platform-core/xwiki-platform-ckeditor

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • stable-16.3.x
    • stable-15.10.x (manually, as part of XWIKI-22073 since not released yet)
    • stable-14.10.x (manually, as part of XWIKI-22073 since not released yet)

@manuelleduc manuelleduc added backport stable-15.10.x Used for automatic backport to 15.10.x branch. backport stable-14.10.x labels May 6, 2024
@manuelleduc manuelleduc merged commit 6bc8777 into xwiki:master May 6, 2024
3 checks passed
github-actions bot pushed a commit that referenced this pull request May 6, 2024
@manuelleduc @github-actions
XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG (#…
010a937 
…3102)

(cherry picked from commit 6bc8777)
@github-actions github-actions bot mentioned this pull request May 6, 2024
Merged
github-actions bot pushed a commit that referenced this pull request May 6, 2024
@manuelleduc @github-actions
XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG (#…
d8a72da 
…3102)

(cherry picked from commit 6bc8777)
@github-actions github-actions bot mentioned this pull request May 6, 2024
Merged
github-actions bot pushed a commit that referenced this pull request May 6, 2024
@manuelleduc @github-actions
XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG (#…
1cd08c2 
…3102)

(cherry picked from commit 6bc8777)
@github-actions github-actions bot mentioned this pull request May 6, 2024
Merged
manuelleduc added a commit that referenced this pull request May 6, 2024
@github-actions @manuelleduc
XWIKI-22146: Black square when drag-and-dropping an image in WYSIWYG (#…
72bf551 
…3102) (#3106)

(cherry picked from commit 6bc8777)

Co-authored-by: Manuel Leduc <manuel.leduc@xwiki.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michitux michitux michitux left review comments

Assignees
No one assigned
Labels
backport stable-14.10.x backport stable-15.10.x Used for automatic backport to 15.10.x branch. backport stable-16.3.x
Projects
None yet
Milestone
No milestone
2 participants
@manuelleduc @michitux