Commit graph

14660 commits

Author SHA1 Message Date
David Scotson
289320528c MDL-34293 Themes: Added thead to flexible table 2012-08-17 14:50:20 +08:00
Matt Meisberger
dbc623c4fc MDL-34742 - adding ability to move blocks into empty column 2012-08-17 14:44:06 +08:00
Eloy Lafuente (stronk7)
1a33536c4d MDL-34934 general: Delete unnecessary .gitignore 2012-08-16 20:43:24 +02:00
Tim Hunt
85b72a7511 MDL-34889 phpunit: progress output in util.php --drop.
It is slow for me, and it is nice to know that something is going on.
2012-08-16 17:13:59 +01:00
Tim Hunt
2ec325c252 MDL-29847 question preview: garbage collect old preview data.
This adds cron code which looks for question previews that have not been
touched for more than 24 hours, and deletes them.

We try to delete previews immediately. For example if the user clicks
start again, then we immediately delete their previous preview. However,
we can't do that if they just close the preview window. Hence we need
some cron code to clean up old preview that have got left lying around.

Normally, this code will not have much to do, so it will be very fast,
so we can afford to run it every cron.

This has been implemented in such a way that in future it will be easy
to add other cron code to the question bank.

Sadly, to make this work on MySQL, we require a horrible hack in the
already hacky delete_usage_records_for_mysql function.
2012-08-16 17:02:01 +01: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
Rex Lorenzo
1f09018af7 MDL-34866 - Make "course display" default a site configurable option
* Moved COURSE_DISPLAY_SINGLEPAGE and COURSE_DISPLAY_MULTIPAGE constants from courselib to moodlelib.php
* Using course display constants in course default admin setting page
2012-08-14 12:12:14 -07: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
Ankit Agarwal
194ab42205 MDL-34535 message: userto should use is_number instead of is_init 2012-08-14 14:41:00 +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
Rajesh Taneja
dea75f643d MDL-32759 Assignment: Grades will not be scaled for new assignment module, and added warning message for user 2012-08-14 11:23:33 +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