Commit graph

14005 commits

Author SHA1 Message Date
Frederic Massart
d5bdbbba26 MDL-34756 Unit Tests: Move backup helper tests 2012-08-20 10:24:37 +08:00
Frederic Massart
7b05e14659 MDL-28531 Unit Tests: Fixed tests to work with core update 2012-08-17 15:00:10 +08:00
Frederic Massart
4d91f7354e MDL-28531 Backup: Automated backups run when they are scheduled 2012-08-17 15:00:10 +08:00
sam marshall
007bf47f10 MDL-34446 Fix bugs in previous commit 2012-08-16 14:37:11 +08:00
Eloy Lafuente (stronk7)
92f2403bf3 Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle 2012-08-15 03:18:58 +02:00
Eloy Lafuente (stronk7)
4998a013aa Merge branch 'MDL-34885' of git://github.com/timhunt/moodle 2012-08-15 03:16:16 +02:00
Eloy Lafuente (stronk7)
76b97631b0 Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-08-15 00:41:04 +02:00
Eloy Lafuente (stronk7)
267c898bfd Merge branch 'w33_MDL-34782_m24_mysqlunsigned' of git://github.com/skodak/moodle 2012-08-14 23:09:30 +02:00
Tim Hunt
6d3b1e1f9d MDL-34885 phpunit: better cygwin detection.
For some reason, on my computer, $_SERVER['SHELL'] was not set, so I
changed the test to also consider $_SERVER['TERM']. This now works for
me.
2012-08-14 14:06:24 +01:00
Aparup Banerjee
50f0c35dd3 Merge branch 'master_MDL-34382_add_new_option_to_flag_modules_that_support_plagiarism_plugins' of git://github.com/kanikagoyal/moodle 2012-08-14 15:48:19 +08:00
Dan Poltawski
3542e01a0c MDL-34741 yui - version bump for 2in3 and upgrade.txt note 2012-08-14 15:33:32 +08: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
Dan Poltawski
16f1d5010e Merge branch 'MDL-34728' of git://github.com/timhunt/moodle 2012-08-14 13:28:49 +08:00
Dan Poltawski
78145050c6 Merge branch 'w33_MDL-33041_m24_tinymceplugins' of git://github.com/skodak/moodle 2012-08-14 11:58:05 +08:00
Kanika Goyal
67fbfe8b54 MDL-34593: Plagiarism API - add extra plgin param to get_form_elements_module 2012-08-13 20:31:45 +05:30
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
Tim Hunt
bef9ab0ad5 MDL-34728 forms: woy for other JS to trigger disableIf update.
This was discovered while working on MDL-32705. If some JavaScript (for
example a select all/none link) changes the state of some form fields,
then the disabledIf state of other form elements does not automatically
update.

The existing form JS was so well encapsulated that this was impossible.
This change pokes a hole in the encapsulation, and provides an API
    M.form.updateFormState(formid);
that other bits of JS code can call when necessary.
2012-08-13 11:13:06 +01:00
Kanika Goyal
50da4ddd56 MDL-34382: Plagiarism API - add new option to flag modules that support the use of plagiarism plugins 2012-08-13 11:02:34 +05:30
Dan Poltawski
2b1ddbb8af Merge branch 'MDL-34446-master' of git://github.com/sammarshallou/moodle 2012-08-13 10:44:11 +08:00
Petr Škoda
e8f4b30638 MDL-33734 remove unused session code
Credit goes to Davo Smith, thanks!
2012-08-12 14:25:18 +02:00
Petr Škoda
a33e740789 MDL-34741 improve inline docs 2012-08-12 12:01:10 +02:00
Petr Škoda
e0a5793d8f MDL-34741 remove deprecated M.yui.loader 2012-08-12 11:41:25 +02:00
Petr Škoda
82e7d74ece MDL-34741 use 2in3 in static JS 2012-08-11 20:40:10 +02:00
Petr Škoda
99a91bbad1 MDL-34741 remove unused legacy course files code 2012-08-11 20:40:10 +02:00
Petr Škoda
1a59e7151a MDL-34741 use 2in3 in forms 2012-08-11 20:40:07 +02:00
Petr Škoda
6adabe48eb MDL-34741 use 2in3 in date selector form element 2012-08-11 20:40:04 +02:00
Petr Škoda
2f422271c2 MDL-34741 use proper default YUI_config 2012-08-11 20:40:02 +02:00
Petr Škoda
1c76d55a40 MDL-34714 switch to YUI 2in3 2012-08-11 20:40:01 +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
29e036904f MDL-33041 mark new TinyMCE subplugins as standard plugins 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