Merge pull request #95 from simonwelsh/silverstripe-cms

--- ssmacron had a reference to sapphire. Rather than trying to figure out how to make it variable, moving the plugin into third party means the path doesnt need it. ssbuttons is also moved and now all the tinyMCE related JS is in sapphire. See also silverstripe/silverstripe-framework#310 Conflicts: javascript/tinymce_ssbuttons/editor_plugin_src.js
silverstripe · Apr 16, 2012 · dcdb0b4 · dcdb0b4
2 parents 75dcc5b + 517bf31
commit dcdb0b4
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 210 deletions.
diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
diff --git a/javascript/tinymce_ssbuttons/img/flash.gif b/javascript/tinymce_ssbuttons/img/flash.gif
diff --git a/javascript/tinymce_ssbuttons/langs/de.js b/javascript/tinymce_ssbuttons/langs/de.js
diff --git a/javascript/tinymce_ssbuttons/langs/en.js b/javascript/tinymce_ssbuttons/langs/en.js
diff --git a/javascript/tinymce_ssmacron/editor_plugin_src.js b/javascript/tinymce_ssmacron/editor_plugin_src.js
diff --git a/javascript/tinymce_ssmacron/img/macron.png b/javascript/tinymce_ssmacron/img/macron.png
diff --git a/javascript/tinymce_ssmacron/js/macron.js b/javascript/tinymce_ssmacron/js/macron.js
diff --git a/javascript/tinymce_ssmacron/macron.htm b/javascript/tinymce_ssmacron/macron.htm