Damyon Wiese 9ced78bd3e Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle ...

Conflicts:
	version.php

2013-07-23 10:37:20 +08:00

..

classes

MDL-40648 Added useful functions find_button() and count_button_rows()

2013-07-19 14:13:18 +10:00

cli

MDL-35289 use unmodified TinyMCE

2012-09-09 11:57:25 +02:00

db

MDL-23646 tinymce: Add upgrade algorithm for custom toolbars.

2013-07-09 13:22:33 +08:00

lang/en

MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor

2013-07-09 13:02:05 +08:00

plugins

Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle

2013-07-23 10:37:20 +08:00

tests

MDL-40648 unittests for editor_tinymce_plugin

2013-07-19 14:29:14 +10:00

tiny_mce/3.5.8

MDL-37282 import TinyMCE 3.5.8

2012-12-22 16:24:20 +01:00

yui

MDL-40282 Collapsible editor loses border in IE8-9

2013-06-28 11:18:28 +01:00

adminlib.php

MDL-40220 use new core_component::get_plugin_list()

2013-07-16 22:36:11 +02:00

all_strings.php

MDL-40220 use new core_component::get_plugin_list()

2013-07-16 22:36:11 +02:00

lib.php

MDL-23646: Tinymce wrap plugin fixes.

2013-07-09 13:22:33 +08:00

module.js

NOBUG - reduce whitespace errors a little

2013-04-15 13:29:14 +01:00

readme_moodle.txt

MDL-37282 import TinyMCE 3.5.8

2012-12-22 16:24:20 +01:00

settings.php

Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle

2013-07-10 11:02:21 +12:00

styles.css

MDL-23646 tinymce: Add plugin to wrap toolbar on small screens

2013-07-09 13:22:33 +08:00

subplugins.php

MDL-40574 remove forgotten $delete from editor subplugins page

2013-07-12 12:33:05 +02:00

upgrade.txt

MDL-40648 annotated new functions in upgrade.txt

2013-07-19 14:29:14 +10:00

version.php

MDL-23646 tinymce: Add plugin to wrap toolbar on small screens

2013-07-09 13:22:33 +08:00