-
-
Notifications
You must be signed in to change notification settings - Fork 2
Fix outdated TinyMCE settings #91
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
Conversation
TinyMCE version 7 introduced changes in the init settings. See also plone/mockup@eac9e4b
|
Tibor Szakmany the email address in your commit does not match an email in your GitHub account. Thus it is impossible to determine whether you have signed the Plone Contributor Agreement, which is required to merge this pull request. Learn about the Plone Contributor Agreement: https://plone.org/foundation/contributors-agreement If you have sent in your Plone Contributor Agreement, and received and accepted an invitation to join the Plone GitHub organization, then you might need to either add the email address on your Agreement to your GitHub account or change the email address in your commits. If you need to do the latter, then you should squash the commits with your matching email and push them. Add more emails to your GitHub account: Change the email address in your commits: |
|
@szakitibi thanks for creating this Pull Request and helping to improve Plone! TL;DR: Finish pushing changes, pass all other checks, then paste a comment: To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically. Happy hacking! |
|
Might worth adding |
|
@szakitibi hi, sorry, I totally missed your PR. In the meantime it was already fixed with this one: #92 - just one after yours. I have rebased your changes on top of the plone.base main branch and it now contains only the TinyMCE 7 setting changes. To get this fixed you still need to sign the contributors agreement. |
|
@thet @szakitibi has signed the PCA after submitting this PR. Either closing and reopening this PR, or pushing a commit to it, will trigger the check. However, there are merge conflicts that @szakitibi would first need to resolve. |
|
Tibor Szakmany the email address in your commit does not match an email in your GitHub account. Thus it is impossible to determine whether you have signed the Plone Contributor Agreement, which is required to merge this pull request. Learn about the Plone Contributor Agreement: https://plone.org/foundation/contributors-agreement If you have sent in your Plone Contributor Agreement, and received and accepted an invitation to join the Plone GitHub organization, then you might need to either add the email address on your Agreement to your GitHub account or change the email address in your commits. If you need to do the latter, then you should squash the commits with your matching email and push them. Add more emails to your GitHub account: Change the email address in your commits: |
@thet I did resolve the conflicts, but the changes left are minimal, @petschki did all the hard work already in #92 👏. As I mentioned in the description above, these minimal changes would still have to have their matching changes in
I signed it long time ago. 🤔 However I pushed commit 46b09a6 by accident from a local clone with work email. 😞 Seems like this is the reason for the PCA check failure. Probably the best course of action would be if @petschki adds the suggested changes to all 3 affected products similar to #92. He has access to all 3 and knows his way around them. The suggested changes are:
Then this PR can be closed without a merge. |
|
Am I correct, that the /cc @mauritsvanrees |
|
@petschki Yes, the main branch is for 6.2 only. |
|
closing this in favor of #93 |
Fixes #86.
Similar to #83 it will also require: