Commit graph

1503 commits

Author SHA1 Message Date
Dan Poltawski
6bea7da1ab Merge branch 'wip-MDL-35661-master' of git://github.com/marinaglancy/moodle 2012-10-15 13:31:10 +08:00
Petr Škoda
83828a7725 MDL-35955 use built in spell checker if tinymce spelling plugin disabled 2012-10-13 09:49:58 +02:00
Eloy Lafuente (stronk7)
dbaf9d448d Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle 2012-10-10 00:35:11 +02:00
Marina Glancy
5827bf96ed MDL-35661 Loading of plugin settings for Tinymce plugins (plugininfo_tinymce) 2012-10-09 09:57:57 +08:00
Marina Glancy
087001ee42 MDL-35661 Loading of plugin settings for editor plugins (plugininfo_editor) 2012-10-09 09:57:57 +08:00
Sam Hemelryk
436dbeecda MDL-22955 theme: Added ability to use SVG format for icons 2012-10-08 09:16:14 +13:00
Petr Škoda
f4b980062a MDL-35645 make the emoticon and tex filter dependency optional in our TinyMCE plugins 2012-10-06 10:10:51 +02:00
Petr Škoda
dbafb80490 MDL-35561 import latest TinyMCE 3.5.7
The previous version 3.5.6 was incorrectly stored as 3.6.0, sorry.
2012-09-21 11:34:33 +02:00
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
Petr Škoda
5ba3a966f6 MDL-35284 patch empty toolbar crashing TinyMCE 2012-09-10 22:10:25 +02:00
Petr Škoda
79df150a62 MDL-35318 use new lang revision to invalidate TinyMCE lang caches 2012-09-09 12:18:32 +02:00
Petr Škoda
29149f981c MDL-35289 use unmodified TinyMCE 2012-09-09 11:57:25 +02:00
Petr Škoda
a4a4b2f6c6 MDL-35289 use new TinyMCE en lang import
AMOS BEGIN
  MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
  MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END
2012-09-07 10:11:37 +02:00
Eloy Lafuente (stronk7)
0cbf023ab6 Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle 2012-09-06 12:08:26 +02:00
Petr Škoda
717a993122 MDL-35172 fix handling of more than 10 tinymce toolbars 2012-09-05 08:23:36 +02:00
Petr Škoda
03f48b4797 MDL-35177 add tinymce plugin icons 2012-09-01 11:36:13 +02:00
Petr Škoda
c64f13178a MDL-35172 rework editor toolbar setting 2012-08-31 22:52:45 +02:00
Petr Škoda
5854be2587 MDL-34990 fix JS error when moodlenolink button not present in toolbar
Thanks Rossiani Wijaya for discovering this issue!
2012-08-29 16:13:30 +08:00
Petr Škoda
71c3b0479a MDL-34955 fix use of uninitialised disabledsubplugins setting
Thanks Eloy Lafuente for spotting it!
2012-08-28 18:57:19 +02:00
Petr Škoda
ddcea181af MDL-34955 fix sloppy class typo and add MUC TODO info
Credit goes to Aparup Banerjee, thanks.
2012-08-28 16:17:43 +08:00
Petr Škoda
b3aefe3cc8 MDL-34990 improve custom toolbar setting parsing
It is probably better to parse the setting every time because somebody may put unsupported values directly into config.php, performance should not be an issue because we do not have editors on every page.
2012-08-24 16:11:00 +02:00
Petr Škoda
0bc9b897f9 MDL-34879 add upgrade.txt notes to editor_tinymce 2012-08-24 16:11:00 +02:00
Petr Škoda
883ecce0e9 MDL-34955 fix missing string 2012-08-24 16:11:00 +02:00
Petr Škoda
0b7858221c MDL-34955 add full TinyMCE subplugin management 2012-08-24 16:11:00 +02:00
Petr Škoda
caaccae5da MDL-34878 add custom TinyMCE toolbar setting 2012-08-24 16:10:59 +02:00
Petr Škoda
116ad39b7a MDL-34877 add tinymce subplugin setting support
Includes migration of spell related settings to spellchecker plugin.
2012-08-24 16:10:59 +02:00
Dan Poltawski
d81c02feef Merge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle 2012-08-21 15:44:46 +08:00
Petr Škoda
2cd58c83ea MDL-34876 improve coding style 2012-08-21 09:40:10 +02:00
Petr Škoda
f8c9397222 MDL-34876 add tinymce subplugin uninstallation 2012-08-18 14:03:06 +02:00
Eloy Lafuente (stronk7)
1a33536c4d MDL-34934 general: Delete unnecessary .gitignore 2012-08-16 20:43:24 +02:00
Dan Poltawski
06c548c783 Merge branch 'w33_MDL-34741_m24_yui2in3' of git://github.com/skodak/moodle 2012-08-14 15:33:10 +08:00
Petr Škoda
43552bd2c3 MDL-33041 fix tabs in all tinymce files except those we update from upstream
The moodleimage plugin is a fork of standard advimage plugin,
the spellchecker is a fork of https://github.com/tinymce/tinymce_spellchecker_php.
2012-08-13 14:13:46 +02:00
Petr Škoda
8ccb3ce861 MDL-33041 improve our tinymce plugin loader docs 2012-08-13 14:13:09 +02:00
Petr Škoda
e0a5793d8f MDL-34741 remove deprecated M.yui.loader 2012-08-12 11:41:25 +02:00
Petr Škoda
d2711aa088 MDL-33041 send only valid plugin strings to TinyMCE instances 2012-08-11 16:33:05 +02:00
Petr Škoda
de6a651299 MDL-33041 cleanup the rest of tinymce plugin 2012-08-11 16:19:37 +02:00
Petr Škoda
51e95db375 MDL-33041 cleanup spellchecker plugin 2012-08-11 15:58:50 +02:00
Petr Škoda
383d67f80b MDL-33041 cleanup moodlenolink plugin
AMOS BEGIN
  MOV [desc,tinymce_moodlenolink],[moodlenolink:desc,tinymce_moodlenolink]
AMOS END
2012-08-11 15:58:50 +02:00
Petr Škoda
1edb79824c MDL-33041 cleanup moodlemedia plugin 2012-08-11 15:58:50 +02:00
Petr Škoda
f33693a86a MDL-33041 cleanup moodleimage plugin 2012-08-11 15:58:21 +02:00
Petr Škoda
703763f670 MDL-33041 use standard action buttons in dragmath plugin 2012-08-11 15:58:21 +02:00
Petr Škoda
ea5437fd7d MDL-33041 cleanup moodleemoticon plugin
AMOS BEGIN
  MOV [desc,tinymce_moodleemoticon],[moodleemoticon:desc,tinymce_moodleemoticon]
AMOS END
2012-08-11 15:58:05 +02:00
Petr Škoda
07ce641b75 MDL-33041 cleanup dragmath plugin
AMOS BEGIN
  MOV [dragmath_desc,tinymce_dragmath],[dragmath:desc,tinymce_dragmath]
  MOV [dragmath_title,tinymce_dragmath],[title,tinymce_dragmath]
  MOV [dragmath_javaneeded,tinymce_dragmath],[javaneeded,tinymce_dragmath]
AMOS END
2012-08-11 15:57:38 +02:00
Petr Škoda
e4907cab85 MDL-33041 add base TinyMCE and moodle plugin urls
We should never use ../../../.. to reference core TinyMCE or moodle TinyMCE plugins, this crate problems if we ever decide to create improved loaders.
2012-08-11 15:57:38 +02:00
Petr Škoda
8585624a6c MDL-33041 always use only local media in moodle tinymce plugins
Unfortunately we can not post-process the css in out moodle tinymce plugins, that is why we need to keep the urls local.
2012-08-11 15:57:38 +02:00
Petr Škoda
a3f1cd0318 MDL-33041 import TinyMCE 3.6.0
This contains only string handling changes - finally!
2012-08-11 15:57:37 +02:00
Petr Škoda
065f329a95 MDL-33041 remove another ugly TinyMCE forms hack 2012-08-11 15:57:35 +02:00
Petr Škoda
e4ad5d8a5e MDL-33041 eliminate core TinyMCE moodlemedia hack 2012-08-11 15:57:35 +02:00
Petr Škoda
fb7bcc1396 MDL-33041 fork advimage plugin
We need to minimise TinyMCE tweaks, the advimage hacking was too big to maintain it during upstream imports, sorry.
2012-08-11 15:56:58 +02:00
Petr Škoda
8421f5ebbf MDL-33041 add missing spellchecker lang file and version info 2012-08-10 16:38:54 +02:00