Merge pull request #2657 from edx/christina/tinymce-upgrade

Upgrade TinyMCE and switch to CodeMirror plugin
This commit is contained in:
Andy Armstrong
2014-03-24 11:53:17 -04:00
371 changed files with 8236 additions and 43474 deletions

View File

@@ -17,8 +17,8 @@
<script type="text/javascript" src="${static.url('js/vendor/jquery-jvectormap-1.1.1/jquery-jvectormap-world-mill-en.js')}"></script>
<script type="text/javascript" src="${static.url('js/course_groups/cohorts.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/codemirror-compressed.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tiny_mce.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/tinymce.min.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/tiny_mce/jquery.tinymce.min.js')}"></script>
<script type="text/javascript">
(function() {window.baseUrl = "${settings.STATIC_URL}";})(this);
</script>