Eloy Lafuente (stronk7)
2672817478
Merge branch 'w34_MDL-34960_m24_gmapsv2drop' of git://github.com/skodak/moodle
2012-08-20 20:34:13 +02:00
Eloy Lafuente (stronk7)
040d4c63be
Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle
2012-08-20 16:34:18 +02:00
Eloy Lafuente (stronk7)
53db05a507
Merge branch 'MDL-28531-master' of git://github.com/FMCorz/moodle
2012-08-20 16:28:09 +02:00
Dan Poltawski
328e4d280c
Merge branch 'w34_MDL-34956_m24_pluginlibregression' of git://github.com/skodak/moodle
2012-08-20 15:56:41 +08:00
Dan Poltawski
9d218eedb5
Merge branch 'w34_MDL-34740_m24_pageclass' of git://github.com/skodak/moodle
2012-08-20 15:33:36 +08:00
Dan Poltawski
20db0a6ff0
Merge branch 'MDL-34934' of git://github.com/stronk7/moodle
2012-08-20 14:46:42 +08:00
Dan Poltawski
7447d328dd
Merge branch 'MDL-31926-master' of git://github.com/FMCorz/moodle
2012-08-20 12:12:54 +08:00
Dan Poltawski
a563bdc119
Merge branch 'MDL-34535-master' of git://github.com/ankitagarwal/moodle
2012-08-20 12:06:50 +08:00
Frederic Massart
d5bdbbba26
MDL-34756 Unit Tests: Move backup helper tests
2012-08-20 10:24:37 +08:00
Petr Škoda
2ea6d5686f
MDL-34893 use standard options in Hint_ResultPrinter
...
This is a very nasty hack!
2012-08-19 22:09:46 +02:00
Petr Škoda
704533fca7
MDL-34960 drop deprecated Google Maps API V2
2012-08-19 20:07:27 +02:00
Petr Škoda
fcb46048c1
MDL-34901 fix user login times handling
2012-08-19 15:33:31 +02:00
Petr Škoda
e197d9a457
MDL-34956 fix recent plugin parent fetching regression
2012-08-18 21:52:44 +02:00
Petr Škoda
f8c9397222
MDL-34876 add tinymce subplugin uninstallation
2012-08-18 14:03:06 +02:00
Petr Škoda
7d59d8dae1
MDL-34954 allow subplugins to define plugininfo_* class
2012-08-18 13:03:58 +02:00
Petr Škoda
975311d3d2
MDL-34954 prevent false IDE code inspection errors
2012-08-18 12:47:58 +02:00
Petr Škoda
b4bfdf5a53
MDL-34954 include filelib stuff only when needed
2012-08-18 12:46:05 +02:00
Petr Škoda
3edc37cb13
MDL-34740 add class file option to $CFG->moodlepageclass and $CFG->blockmanagerclass
2012-08-18 10:02:46 +02:00
Petr Škoda
4a38e65977
MDL-34912 fix invalid descriptionformat default handling
2012-08-18 09:52:31 +02:00
sam marshall
5ae17b09a8
MDL-31957 Course reset: Does not erase activity completion data
2012-08-17 10:35:44 +01: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
Frederic Massart
c216eb2008
MDL-31926 Course: Obfuscating an email supports subject and body parameters
2012-08-17 14:59:46 +08:00
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