-
Notifications
You must be signed in to change notification settings - Fork 5
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
Tinymce update with upstream #7
Conversation
Let's merge this once we've tested it out in Shopify and let it run in production for awhile. Just in case this update becomes problematic. |
Added CircleCI config so now we're encouraged to modify & track changes with tests. |
80d574c
to
c72cff4
Compare
I'm a bit late to the party but my commit f51b9c2 was merged upstream already, it didn't need to be cherry-picked, this will cause the 'load' event to be fired twice. |
the double 'load' is because the upstream patch was implemented slightly differently due to upstream code changes. |
So can I simply extract your commit or are there changes that need to be done? |
c72cff4
to
8935c20
Compare
🏇 💨 |
Everything running pretty smooth so far. |
This PR updates our fork of TinyMCE to the latest upstream master. I made a clean fork of upstream and cherry-picked our commits over. I left out commits that fixed bugs already fixed in upstream. Commits cherry-picked over:
There are some tests that test for things we want/don't want in Admin. I commented them out, but would be happy to just delete them too:
Since this branch rewrites the history of master It'll have to be a force push.
@angelini @nsimmons