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

FIX Add tinymce link menuitems per editor instance #2916

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented Jan 23, 2024

IMPORTANT NOTE

This PR needs silverstripe/silverstripe-admin#1653 to be merged before CI will go green.

The functionality in silverstripe/silverstripe-admin#1653 is required for this PR to work at all - and the code in this PR will not work with earlier versions of silverstripe/admin. Because of this, it should not be merged until that PR has been merged and tagged, and the new constraint has been checked to ensure it is correct.

Description

Updates the cms TinyMCE link plugins to match silverstripe/silverstripe-admin#1653

Manual testing steps

See issue for reproduction steps

Issues

Pull request checklist

  • The target branch is correct
  • All commits are relevant to the purpose of the PR (e.g. no debug statements, unrelated refactoring, or arbitrary linting)
    • Small amounts of additional linting are usually okay, but if it makes it hard to concentrate on the relevant changes, ask for the unrelated changes to be reverted, and submitted as a separate PR.
  • The commit messages follow our commit message guidelines
  • The PR follows our contribution guidelines
  • Code changes follow our coding conventions
  • This change is covered with tests (or tests aren't necessary for this change)
  • CI is green

Copy link
Member

@emteknetnz emteknetnz left a comment

Choose a reason for hiding this comment

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

PR is fine, just need to update the contraint

composer.json Outdated
@@ -19,7 +19,7 @@
}
],
"require": {
"silverstripe/admin": "^1.13@dev",
"silverstripe/admin": "^1.13.99",
Copy link
Member

Choose a reason for hiding this comment

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

Needs to be changed

Copy link
Member Author

Choose a reason for hiding this comment

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

@GuySartorelli GuySartorelli force-pushed the pulls/1.13/fix-tinymce-link-plugins branch from 503f980 to aa0f711 Compare January 24, 2024 20:33
@GuySartorelli GuySartorelli marked this pull request as ready for review January 24, 2024 20:33
@emteknetnz emteknetnz merged commit dfc42e7 into silverstripe:4.13 Jan 24, 2024
12 checks passed
@emteknetnz emteknetnz deleted the pulls/1.13/fix-tinymce-link-plugins branch January 24, 2024 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants