Eloy Lafuente (stronk7) 2c248bd416 Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle ...

Conflicts:
	lib/editor/tinymce/version.php

2012-09-10 22:13:36 +02:00

..

classes

MDL-35172 rework editor toolbar setting

2012-08-31 22:52:45 +02:00

cli

MDL-35289 use unmodified TinyMCE

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

db

MDL-35172 rework editor toolbar setting

2012-08-31 22:52:45 +02:00

lang/en

MDL-35289 use unmodified TinyMCE

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

plugins

MDL-35289 use new TinyMCE en lang import

2012-09-07 10:11:37 +02:00

tests

MDL-35172 fix handling of more than 10 tinymce toolbars

2012-09-05 08:23:36 +02:00

tiny_mce/3.6.0

MDL-35289 use unmodified TinyMCE

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

adminlib.php

MDL-35177 add tinymce plugin icons

2012-09-01 11:36:13 +02:00

all_strings.php

MDL-35289 use unmodified TinyMCE

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

editor_styles.css

MDL-20204 first batch of major theme changes, some regressions are still there, expect more changes and improvements soon; see tracker for details and list of subtasks

2009-12-16 18:00:58 +00:00

lib.php

MDL-35318 use new lang revision to invalidate TinyMCE lang caches

2012-09-09 12:18:32 +02:00

module.js

MDL-35284 patch empty toolbar crashing TinyMCE

2012-09-10 22:10:25 +02:00

readme_moodle.txt

MDL-35289 use unmodified TinyMCE

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

settings.php

MDL-35172 rework editor toolbar setting

2012-08-31 22:52:45 +02:00

subplugins.php

MDL-34955 add full TinyMCE subplugin management

2012-08-24 16:11:00 +02:00

upgrade.txt

MDL-35289 use unmodified TinyMCE

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

version.php

Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle

2012-09-10 22:13:36 +02:00