mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
55,766 Commits 36 Branches 519 Tags
Commit Graph

527 Commits

Author SHA1 Message Date
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
sam marshall
9b63a155fe MDL-33041 (5) TinyMCE: Move spellchecker plugin as well 2012-08-10 14:57:59 +02:00
sam marshall
204903363f MDL-33041 (4) Use new system for existing added TinyMCE plugins 
AMOS BEGIN
  MOV [dragmath:dragmath_desc,editor_tinymce],[dragmath_desc,tinymce_dragmath]
  MOV [dragmath:dragmath_javaneeded,editor_tinymce],[dragmath_javaneeded,tinymce_dragmath]
  MOV [dragmath:dragmath_title,editor_tinymce],[dragmath_title,tinymce_dragmath]
  MOV [moodleemoticon:desc,editor_tinymce],[desc,tinymce_moodleemoticon]
  MOV [moodlenolink:desc,editor_tinymce],[desc,tinymce_moodlenolink]
  CPY [desc,tinymce_moodleemoticon],[pluginname,tinymce_moodleemoticon]
  CPY [desc,tinymce_moodlenolink],[pluginname,tinymce_moodlenolink]
AMOS END
 2012-08-10 14:57:59 +02:00
sam marshall
fae911708e MDL-33041 (3) TinyMCE: Support custom plugins 2012-08-10 14:57:58 +02:00
sam marshall
1702fb6dda MDL-33041 (2) Tidy up tinymce lib.php before starting real changes 2012-08-10 14:57:58 +02:00
Dan Poltawski
87dd647f04 Merge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle 2012-07-30 15:23:27 +08:00
Petr Škoda
4b8d031a4e MDL-34616 fix editor resizing regression 2012-07-29 14:48:23 +02:00
Adrian Greeve
b0c6dc1cac MDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8) 2012-07-27 10:10:46 +08:00
Dan Poltawski
b7db7803bc Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-24 14:07:26 +08:00
Luke Tucker
8bc4a6528f MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required() 2012-07-21 20:29:20 +02:00
Petr Škoda
13725b3797 MDL-34299 remove xmlstrictheaders setting and switch to html5 doctype by default 
This fixes WCAG 2.0 compliance because we were already using HTML5 markup.

The strict XML headers setting never worked for production servers, developers
used browser validators for compliance testing. XHTML 5 option is relatively
similar to this obsolete option, but still it can not be used on production servers.

XHTML Strict 1.x was a standardised dead end, HTML5 is the new de-facto-standard
supported by all major browsers including latest versions of IE.

Please note nothing changes in our coding style because HTML5 is a superset of
several previous standards, it is recommended to use only features that are
already implemented in all our supported browsers.
 2012-07-21 19:23:44 +02:00
Dan Poltawski
94a9c8cae1 Merge branch 'w28_MDL-33454_m24_tinymce3541' of git://github.com/skodak/moodle 2012-07-11 14:45:41 +08:00
Petr Škoda
9177036440 MDL-33454 add forgotten TinyMCE min_height setting name change 2012-07-11 08:41:06 +02:00
Dan Poltawski
06dd4335aa Merge branch 'w28_MDL-33712_m24_extratags' of git://github.com/skodak/moodle 2012-07-10 15:55:58 +08:00
Petr Škoda
efc80e2bb8 MDL-33454 import latest TinyMCE 3.5.4.1 2012-07-06 08:10:14 +02:00
Petr Skoda
64ed8ca214 MDL-33712 add support for unique moodle tags in tinymce 2012-07-06 08:04:00 +02:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Nadav Kavalerchik
7dd65ae2f2 MDL-32802 - RTL CSS fixes for Moodle 2 (lib/editor/tinymce) 
Right align theme Clearlooks2
/lib/editor/tinymce/tiny_mce/3.4.9/plugins/inlinepopups/skins/clearlooks2/window.css
 2012-06-13 13:55:17 +08:00
Petr Skoda
798f0dece2 MDL-33114 import TinyMCE 3.5.1.1 and fix preview 2012-05-24 23:15:52 +02:00
Petr Skoda
1fea5537d4 MDL-26901 add new option to specify list of available fonts in TinyMCE 
Also modified the list of languages appearance, textarea is more suitable for entry of long texts. It is now also possible to specify empty list of languages and fonts which removes the button from the editor toolbar. Includes release name fix.
 2012-05-11 22:12:32 +02:00
Aparup Banerjee
e1e3fa217f Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle 2012-05-10 10:52:32 +08:00
sam marshall
f4e7ba5ea8 MDL-29624 Media embedding system, part 2: preview in file picker 
The JavaScript file picker API shows a preview of the media file you have chosen.
This preview facility now uses an iframe, in order not to duplicate the embed code
in JavaScript. The iframe uses the standard embed API.
 2012-05-09 18:29:30 +01:00
Petr Skoda
3690955e65 MDL-32680 import latest TinyMCE 3.5 2012-05-03 15:49:23 +02:00
Petr Skoda
bc81191a09 MDL-32775 fix invalid url in mediaplugin CSS 2012-05-05 10:31:51 +02:00
Petr Skoda
c8bd9402ea MDL-32449 import latest version of TinyMCE 3.5dev 2012-04-21 11:04:54 +02:00
Petr Skoda
866e1112c5 MDL-30636 switch to new TinyMCE 3.4.9 2012-03-03 10:46:39 +01:00