Skip to content

Conversation

@theInternauts
Copy link

update from upstream

musaffa and others added 30 commits March 17, 2015 01:53
Allow to call helper methods with the module as a receiver.
…s_load

fix for tinyMCE undefined in asynchronous javascript load
- 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
spohlenz and others added 30 commits August 31, 2016 10:14
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants