moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
78366 commits 37 branches 540 tags 1.3 GiB
Commit graph

466 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
275c2c9f8a Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle 2013-04-09 19:40:39 +02:00
Tim Hunt
c4dbaf74e8 MDL-38849 editor collapsing: cope with verbose languages 
We can't fix the width of the tab, because the length of the string
'Show editing tools' varies a LOT between langauges.
 2013-04-08 10:44:51 +01:00
Tim Hunt
e7373221cf MDL-38849 editor CSS: re-format to match coding style. 2013-04-08 10:37:22 +01:00
David Monllao
bd1aca8834 MDL-38965 behat: New test 
According to MDLQA-5229, an admin
can add or remove items from the
TinyMCE editor toolbar.
 2013-04-08 14:42:47 +08:00
Eloy Lafuente (stronk7)
59549129b1 Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle 2013-03-27 23:06:46 +01:00
Andrew Robert Nicols
21db4396ab MDL-38404 JavaScript: Migrate editor_tinymce to use Shifter 2013-03-18 21:56:34 +00:00
Petr Škoda
d0bf51e2b3 MDL-38329 use proper plugin name for the webkit lists workaround 
Credit goes to Mauno Korpelainen, thanks.
 2013-03-17 20:59:11 +01:00
Sam Hemelryk
dff72cde30 Merge branch 'MDL-32750' of git://github.com/colchambers/moodle 2013-01-28 11:57:17 +13:00
Colin Chambers
2a22be64ee MDL-32750 Question: make the html editor tools collapsible 2013-01-25 11:17:41 +00:00
Petr Škoda
1764cd8e6f MDL-37593 use https for editor script if required 2013-01-21 09:40:15 +01:00
Eloy Lafuente (stronk7)
cf78070a63 Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle 2013-01-08 10:34:04 +01:00
Eloy Lafuente (stronk7)
b315a45274 Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle 2013-01-08 10:21:50 +01:00
Dan Poltawski
397e4ecf76 Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle 2013-01-08 14:26:52 +08:00
Sam Hemelryk
dd89f61e68 Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle 2013-01-07 15:22:37 +13:00
Sam Hemelryk
1bdc017f42 Merge branch 'w51_MDL-36212_m25_entities' of git://github.com/skodak/moodle 2013-01-07 13:45:15 +13:00
Petr Škoda
97155c387d MDL-37323 add support for _dlg strings in our TinyMCE subplugins 
Credit goes to Étienne FLORENT, thanks.
 2013-01-01 15:25:43 +01:00
Petr Škoda
0662bd677c MDL-29996 remove deprecated stuff from filter code 2012-12-30 17:02:18 +01:00
Petr Škoda
48d2e1117f MDL-37283 import tinymce spellchecker 2.0.6.1 2012-12-22 16:44:55 +01:00
Petr Škoda
d10f3e9fef MDL-37282 import TinyMCE 3.5.8 2012-12-22 16:24:20 +01:00
Petr Škoda
7539894649 MDL-36212 rework html entity conversions 
This should resolve all html entity conversion problems in different PHP versions.
 2012-12-20 22:47:16 +01:00
Petr Škoda
23ac6ef6c5 MDL-37186 add the ultimate TinyMCE custom parameter setting 2012-12-20 22:24:15 +01:00
Petr Škoda
83be0dfd57 MDL-36475 tweak zIndexes once more 
The expected ranges are now:
* 0-1000 for normal code
* 5000-5999 for TinyMCE
* 7000-8999 for filepicker and filemanager

This patch fixes also incorrect location of "MDL-25736 - French spellchecker fixes." modification reminder.
 2012-12-15 11:46:46 +01:00
Eloy Lafuente (stronk7)
6b9dfe731e MDL-37032 upgrade: define all the 2.4.0 points 2012-12-11 13:11:11 +01:00
Eloy Lafuente (stronk7)
663dbbc2e6 MDL-36933 Bump everything to 2012112900 
(versions, requires and dependencies)
 2012-11-30 03:30:09 +01:00
Frederic Massart
fa9c0aab13 MDL-36633 usability: Styling over the admin pages 2012-11-21 17:29:13 +08:00
Aparup Banerjee
bf10e51d44 MDL-24736 anotating tinymce changes to readme 2012-11-14 09:40:59 +08:00
Aparup Banerjee
f132d28aa5 Merge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle 2012-11-14 09:12:28 +08:00
Iñaki Arenaza
b98dd3ff31 MDL-25736 TinyMce Spellchecker French issues 
GoogleSpell checker already returns data un UTF8, so there's no need
to use utf8_encode (in fact, using it completely mangles the string).

All credit goes to David Quintal for finding the issue and proposing
the fix.
 2012-11-10 19:41:48 +01:00
Petr Škoda
398862b92b MDL-36487 send IE standards compatibility http headers 2012-11-09 17:27:29 +01:00
Petr Škoda
657e6b8199 MDL-36468 fix remaining zIndexes and some { weirdness 
I had to reimport all files and search&replace the zIndexes, it is better to not use editor for this.
 2012-11-09 08:39:14 +01:00
Petr Škoda
9e2d7f560d MDL-35771 patch tinymce to use lower zindexes 
The reason is that YUI does not like that bing zIndexes when dragging panels. We should probably try to find the reason why YUI dragging fails and report it upstream.
 2012-10-24 22:45:23 +08:00
Dan Poltawski
dab6b11914 Merge branch 'w42_MDL-35955_m24_geckospell' of git://github.com/skodak/moodle 2012-10-16 09:57:30 +08:00
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