L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm26_MDL-47170' of https://github.com/totara/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2014-09-30 10:03:12 +13:00
parent b5d4f3e1eb 1f987c8dde
commit 27499a59d6
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/tinymce/readme_moodle.txt
+2
View File
@@ -18,6 +18,8 @@ Upgrade procedure:
Changes:
lib/editor/tinymce/tiny_mce/3.5.10/plugins/fullscreen/editor_plugin_src.js:31-33 - Added checks to see if required functions exist.
There is a javascript error in IE where maximising the tinyMCE editor window with an image in it.
lib/editor/tinymce/tiny_mce/3.5.10/theme/advanced/skins/moodle/content.css:50-53 - Added CSS to allow bullet points to be displayed
in rtl languages.
TODO:
* create some new automated script that sends other languages from upstream into AMOS
lib/editor/tinymce/tiny_mce/3.5.10/themes/advanced/skins/moodle/content.css
+5
View File
@@ -46,3 +46,8 @@ font[face=mceinline] {font-family:inherit !important}
.mceItemAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
#tinymce[dir=rtl] ul,
#tinymce[dir=rtl] ol {
margin: 0 25px 10px 0;
}
lib/editor/tinymce/version.php
+1 -1
View File
@@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2013110602; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2013110603; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2013110500; // Requires this Moodle version
$plugin->component = 'editor_tinymce'; // Full name of the plugin (used for diagnostics)
$plugin->release = '3.5.10'; // This is NOT a directory name, see lib.php if you need to know where is the editor code!