forked from spohlenz/tinymce-rails
-
Notifications
You must be signed in to change notification settings - Fork 0
Update to v4 #2
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
Open
theInternauts
wants to merge
65
commits into
master
Choose a base branch
from
update-to-v4
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update to v4 #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow to call helper methods with the module as a receiver.
…s_load fix for tinyMCE undefined in asynchronous javascript load
Update to TinyMCE 4.3.3
- seems tinymce updated their site, link was broken - the old link can be found at http://archive.tinymce.com/wiki.php/Controls if you prefer that option
…ns-link-in-readme Fix link for config options in README
Update Gemfiles to not use pre-release versions
This fixes compatibility with dynamically added TinyMCE editors.
* Update rails patch and new ruby * Add Travis exclusions for Rails 4.0/4.1 on Ruby 2.4.1
* Offer an install strategy that does not preserve modes When compiling assets as different users (on a typical Linux file system), the `preserve` flag used in the Copy strategy can throw permission errors as it tries to preserve file mode/timestamp information. This `copy_no_preserve` strategy offers an alternative. It may be better to simply remove the flag, but this approach offers a choice. * Add specs for copy_no_preserve install strategy * Add copy_no_preserve info to README * Whitespace cleanup
Conflicts: vendor/assets/javascripts/tinymce/plugins/example/plugin.js vendor/assets/javascripts/tinymce/plugins/image/plugin.js vendor/assets/javascripts/tinymce/plugins/link/plugin.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update from upstream