moodle.git
10 years agoMerge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 01:50:41 +0000 (03:50 +0200)]
Merge branch 'w33_MDL-29020_m22_clidbenrol' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28248b' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Wed, 24 Aug 2011 01:39:23 +0000 (03:39 +0200)]
Merge branch 'MDL-28248b' of https://github.com/totara/moodle

10 years agoMDL-28248 completion: Incorrect SQL for finding enrol start date
Aaron Barnes [Fri, 19 Aug 2011 02:56:29 +0000 (14:56 +1200)]
MDL-28248 completion: Incorrect SQL for finding enrol start date

10 years agoMerge branch 'MDL-28979' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:55:45 +0000 (01:55 +0200)]
Merge branch 'MDL-28979' of git://github.com/timhunt/moodle

10 years agoMDL-28942 qtype multichoice, multi-response. Avoid computing the wrong random guess...
Tim Hunt [Wed, 17 Aug 2011 11:33:00 +0000 (12:33 +0100)]
MDL-28942 qtype multichoice, multi-response. Avoid computing the wrong random guess score.

It is effectively impossible to compute the right random guess score, so we should not compute anything, rather than computing a number that we know is wrong.

This patch also fixes a multianswer unit test error that was shown up by this fix.

10 years agoMerge branch 'MDL-28975' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:44:02 +0000 (01:44 +0200)]
Merge branch 'MDL-28975' of git://github.com/timhunt/moodle

10 years agoMDL-29019 enrol - fix a typo
Sun Zhigang [Sat, 20 Aug 2011 03:24:04 +0000 (11:24 +0800)]
MDL-29019 enrol - fix a typo

10 years agoMerge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 23:17:28 +0000 (01:17 +0200)]
Merge branch 'w33_MDL-19380_m22_repoclamav' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-29000_m22_forgetcase' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 22:56:46 +0000 (00:56 +0200)]
Merge branch 'w33_MDL-29000_m22_forgetcase' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 22:52:56 +0000 (00:52 +0200)]
Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-27228_m22_labelhide' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:35:41 +0000 (23:35 +0200)]
Merge branch 'w33_MDL-27228_m22_labelhide' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:26:06 +0000 (23:26 +0200)]
Merge branch 'w33_MDL-28708_m22_f304' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:16:29 +0000 (23:16 +0200)]
Merge branch 'w33_MDL-28709_m22_h304' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 21:12:34 +0000 (23:12 +0200)]
Merge branch 'w33_MDL-29011_m22_nomanualenrol' of git://github.com/skodak/moodle

10 years agoMDL-28684 QE2 upgrade: whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:52:16 +0000 (22:52 +0200)]
MDL-28684 QE2 upgrade: whitespace fix

10 years agoMerge branch 'MDL-28684b' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:50:03 +0000 (22:50 +0200)]
Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle

10 years agoMerge branch 'MDL-28444' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 20:46:17 +0000 (22:46 +0200)]
Merge branch 'MDL-28444' of git://github.com/timhunt/moodle

10 years agoMerge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 23 Aug 2011 19:03:50 +0000 (03:03 +0800)]
Merge branch 'w33_MDL-28982_m22_sqlfullname' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28687' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 23 Aug 2011 18:24:08 +0000 (02:24 +0800)]
Merge branch 'MDL-28687' of git://github.com/timhunt/moodle

10 years agoMerge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)]
Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle

10 years agoMDL-28962 enrol imsenterprise - whitespace fix
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:39:48 +0000 (18:39 +0200)]
MDL-28962 enrol imsenterprise - whitespace fix

10 years agoMerge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)]
Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-28957' of git://github.com/colchambers/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 16:00:51 +0000 (18:00 +0200)]
Merge branch 'MDL-28957' of git://github.com/colchambers/moodle

10 years agoMerge branch 'MDL-28397' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 15:17:16 +0000 (17:17 +0200)]
Merge branch 'MDL-28397' of https://github.com/totara/moodle

10 years agoMerge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 23 Aug 2011 10:17:26 +0000 (18:17 +0800)]
Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 09:03:19 +0000 (11:03 +0200)]
Merge branch 'w33_MDL-28381_m22_cliphpver' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28996' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 08:41:17 +0000 (10:41 +0200)]
Merge branch 'MDL-28996' of git://github.com/timhunt/moodle

10 years agoMerge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 08:11:41 +0000 (10:11 +0200)]
Merge branch 'w33_MDL-28554_m22_yui' of git://github.com/skodak/moodle

10 years agoMerge branch 'w33_MDL-28935_m22_calendardays' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 07:59:27 +0000 (09:59 +0200)]
Merge branch 'w33_MDL-28935_m22_calendardays' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle
Aparup Banerjee [Tue, 23 Aug 2011 06:07:08 +0000 (14:07 +0800)]
Merge branch 'MDL-28509_master' of git://github.com/marxjohnson/moodle

10 years agoMerge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:49:40 +0000 (02:49 +0200)]
Merge branch 'master_MDL-28999' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'w33_MDL-29016_m22_distropermissions' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:42:40 +0000 (02:42 +0200)]
Merge branch 'w33_MDL-29016_m22_distropermissions' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28990' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:35:05 +0000 (02:35 +0200)]
Merge branch 'MDL-28990' of git://github.com/mouneyrac/moodle

10 years agoMerge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 23 Aug 2011 00:03:19 +0000 (02:03 +0200)]
Merge branch 'w33_MDL-29031_m22_oldblock' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28226' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:42:05 +0000 (01:42 +0200)]
Merge branch 'MDL-28226' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28481' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:36:25 +0000 (01:36 +0200)]
Merge branch 'MDL-28481' of git://github.com/aolley/moodle

10 years agoMerge branch 'w33_MDL-28936_m22_msgstrlen' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:19:52 +0000 (01:19 +0200)]
Merge branch 'w33_MDL-28936_m22_msgstrlen' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-28241' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Aug 2011 23:16:34 +0000 (01:16 +0200)]
Merge branch 'MDL-28241' of git://github.com/timhunt/moodle

10 years agoMDL-28241 editing multianswer questions broken since the fix for MDL-24594.
Tim Hunt [Mon, 22 Aug 2011 21:35:05 +0000 (22:35 +0100)]
MDL-28241 editing multianswer questions broken since the fix for MDL-24594.

10 years agoMerge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)]
Merge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle

10 years agoMDL-28397 completion: Activity completion criteria not showing grading
Aaron Barnes [Mon, 22 Aug 2011 02:54:41 +0000 (14:54 +1200)]
MDL-28397 completion: Activity completion criteria not showing grading
requirement

Credit goes to Evan Irving-Pease for the patch

10 years agoMDL-28481: Send headers before any possible output
Adam Olley [Sun, 21 Aug 2011 23:41:42 +0000 (09:11 +0930)]
MDL-28481: Send headers before any possible output

10 years agoMDL-29011 do not require manual enrol cap on the enrolled users page
Petr Skoda [Sun, 21 Aug 2011 16:17:43 +0000 (18:17 +0200)]
MDL-29011 do not require manual enrol cap on the enrolled users page

10 years agoMDL-29031 drop unused block tables
Petr Skoda [Sun, 21 Aug 2011 15:43:34 +0000 (17:43 +0200)]
MDL-29031 drop unused block tables

10 years agoMDL-27248 remove forgotten unique sortorder index from the course table
Petr Skoda [Sun, 21 Aug 2011 14:46:01 +0000 (16:46 +0200)]
MDL-27248 remove forgotten unique sortorder index from the course table

10 years agoMDL-28981 fix forum_user_can_post() call params
Petr Skoda [Sun, 21 Aug 2011 13:50:23 +0000 (15:50 +0200)]
MDL-28981 fix forum_user_can_post() call params

10 years agoMDL-28982 fix DML use
Petr Skoda [Sun, 21 Aug 2011 13:38:46 +0000 (15:38 +0200)]
MDL-28982 fix DML use

10 years agoMDL-27228: Fix label 'eye' does not match show/hide setting
Tony Levi [Mon, 18 Apr 2011 04:30:36 +0000 (14:00 +0930)]
MDL-27228: Fix label 'eye' does not match show/hide setting

10 years agoMDL-28381 always verify PHP version in CLI scripts
Petr Skoda [Sun, 21 Aug 2011 10:19:59 +0000 (12:19 +0200)]
MDL-28381 always verify PHP version in CLI scripts

The problem is that people may use different php binary for web and CLI.

10 years agoMDL-29000 multiple password reset issues
Petr Skoda [Sat, 20 Aug 2011 17:21:25 +0000 (19:21 +0200)]
MDL-29000 multiple password reset issues

* stop abusing get_complete_user_data()
* fix case-sensitiveness in password reset for PG
* do not allow reset of disabled accounts
* propose a solution for non-unique emails

10 years agoMDL-28444 unit test to verify the fix.
Tim Hunt [Sat, 20 Aug 2011 12:14:07 +0000 (13:14 +0100)]
MDL-28444 unit test to verify the fix.

10 years agoMDL-28935 use weekdays as calendar table headings
Petr Skoda [Sat, 20 Aug 2011 11:45:37 +0000 (13:45 +0200)]
MDL-28935 use weekdays as calendar table headings

10 years agoMDL-28935 Add days of week to monthly calendar view
Jason Ilicic [Mon, 15 Aug 2011 03:04:24 +0000 (12:34 +0930)]
MDL-28935 Add days of week to monthly calendar view

10 years agoMDL-29020 add CLI verbose mode and stop requiring course idnumber when external colum...
Petr Skoda [Sat, 20 Aug 2011 09:22:32 +0000 (11:22 +0200)]
MDL-29020 add CLI verbose mode and stop requiring course idnumber when external column specified

10 years agoMDL-28444 synchronized datasets: fix typo in get_variants_selection_seed()
Henning Bostelmann [Sat, 20 Aug 2011 10:45:41 +0000 (11:45 +0100)]
MDL-28444 synchronized datasets: fix typo in get_variants_selection_seed()

10 years agoMDL-29016 allow distributions to set dataroot permissions
Petr Skoda [Sat, 20 Aug 2011 10:48:44 +0000 (12:48 +0200)]
MDL-29016 allow distributions to set dataroot permissions

10 years agoMDL-28936 fix invalid >200 comparison and utf-8 incompatibility
Petr Skoda [Fri, 19 Aug 2011 16:42:49 +0000 (18:42 +0200)]
MDL-28936 fix invalid >200 comparison and utf-8 incompatibility

Credit for discovery goes to Jason Ilicic.

10 years agoMDL-28708 minor unrelated cleanup and elimination of dead code
Petr Skoda [Fri, 19 Aug 2011 15:24:46 +0000 (17:24 +0200)]
MDL-28708 minor unrelated cleanup and elimination of dead code

10 years agoMDL-28708: Send 304 Not Modified response when browser If-Modified-Since header is...
Tony Levi [Thu, 11 Aug 2011 04:34:36 +0000 (14:04 +0930)]
MDL-28708: Send 304 Not Modified response when browser If-Modified-Since header is after file mtime

10 years agoMDL-28709 adding HTTP_IF_MODIFIED_SINCE and minor style tweaks
Petr Skoda [Fri, 19 Aug 2011 14:32:30 +0000 (16:32 +0200)]
MDL-28709 adding HTTP_IF_MODIFIED_SINCE and minor style tweaks

10 years agoMDL-28709: Performance: Send cache/contenttype headers with 304 responses
Tony Levi [Thu, 11 Aug 2011 05:04:54 +0000 (14:34 +0930)]
MDL-28709: Performance: Send cache/contenttype headers with 304 responses

10 years agoMDL-28684 QE2 upgrade: recognize empty answer in multichoice questions
Henning Bostelmann [Tue, 16 Aug 2011 16:10:35 +0000 (17:10 +0100)]
MDL-28684 QE2 upgrade: recognize empty answer in multichoice questions

10 years agoMDL-28544 workaround for missing YUI 3.4.0 loader info
Petr Skoda [Fri, 19 Aug 2011 08:21:30 +0000 (10:21 +0200)]
MDL-28544 workaround for missing YUI 3.4.0 loader info

10 years agoMDL-28554 import YUI 3.4.0
Petr Skoda [Fri, 19 Aug 2011 05:54:11 +0000 (07:54 +0200)]
MDL-28554 import YUI 3.4.0

10 years agoMDL-28580 Administration: Added sanity check to grab wrong usage of upgrade_main_save...
Rajesh Taneja [Wed, 3 Aug 2011 05:09:08 +0000 (13:09 +0800)]
MDL-28580 Administration: Added sanity check to grab wrong usage of upgrade_main_savepoint

10 years agoMDL-28554 import YUI 2.9.0
Petr Skoda [Fri, 19 Aug 2011 05:49:06 +0000 (07:49 +0200)]
MDL-28554 import YUI 2.9.0

10 years agoMDL-28990 add web service mobile overview
Jerome Mouneyrac [Fri, 19 Aug 2011 03:45:18 +0000 (11:45 +0800)]
MDL-28990 add web service mobile overview

10 years agoMDL-27624 SCORM formating codes
Ankit Kumar Agarwal [Wed, 17 Aug 2011 14:50:11 +0000 (20:20 +0530)]
MDL-27624 SCORM formating codes

10 years agoMDL-27624 Small structural changes
Ankit Kumar Agarwal [Sat, 30 Jul 2011 15:11:19 +0000 (20:41 +0530)]
MDL-27624 Small structural changes

MDL-27624 SCORM adding definition to scrom elements
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/userreport.php

10 years agoMDL-28999 SCORM add missing yui2 require
Dan Marsden [Thu, 18 Aug 2011 22:23:46 +0000 (10:23 +1200)]
MDL-28999 SCORM add missing yui2 require

10 years agoMDL-28996 Quiz view page list of attempts table is sometimes missing a cell.
Tim Hunt [Thu, 18 Aug 2011 18:26:04 +0000 (19:26 +0100)]
MDL-28996 Quiz view page list of attempts table is sometimes missing a cell.

10 years agoMDL-28979 qtype match: correct answer formatted badly.
Tim Hunt [Wed, 17 Aug 2011 15:54:23 +0000 (16:54 +0100)]
MDL-28979 qtype match: correct answer formatted badly.

10 years agoMDL-28975 question engine, JavaScript error in IE.
Tim Hunt [Wed, 17 Aug 2011 12:51:01 +0000 (13:51 +0100)]
MDL-28975 question engine, JavaScript error in IE.

10 years agoMDL-28687 questions avoid fatal errors when reviewing attempts at deleted questions.
Tim Hunt [Tue, 16 Aug 2011 10:36:54 +0000 (11:36 +0100)]
MDL-28687 questions avoid fatal errors when reviewing attempts at deleted questions.

10 years agoMDL-28226 quiz locallib. Fix PHPdoc comment and code to make the API clearer.
Tim Hunt [Thu, 7 Jul 2011 12:11:00 +0000 (13:11 +0100)]
MDL-28226 quiz locallib. Fix PHPdoc comment and code to make the API clearer.

10 years agoMDL-19380 fix redirect when virus found in JS-less mode
Petr Skoda [Thu, 18 Aug 2011 06:57:42 +0000 (08:57 +0200)]
MDL-19380 fix redirect when virus found in JS-less mode

10 years agoMDL-19380 reimplement antivir scanning in repositories
Petr Skoda [Sun, 7 Aug 2011 09:26:03 +0000 (11:26 +0200)]
MDL-19380 reimplement antivir scanning in repositories

10 years agoMDL-28962 enrol imsenterprise - incorrect conversion of new dml syntax - thanks to...
Dan Marsden [Tue, 16 Aug 2011 22:19:26 +0000 (10:19 +1200)]
MDL-28962 enrol imsenterprise - incorrect conversion of new dml syntax - thanks to Patrick Gagnon for report and fix.

10 years agoweekly release 2.2dev
Eloy Lafuente (stronk7) [Thu, 18 Aug 2011 00:41:22 +0000 (02:41 +0200)]
weekly release 2.2dev

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 18 Aug 2011 00:38:24 +0000 (02:38 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years ago#MDL-28957 outputrequirementslib reduced excessive js console logging
Colin Chambers [Wed, 17 Aug 2011 09:04:00 +0000 (10:04 +0100)]
#MDL-28957 outputrequirementslib reduced excessive js console logging

10 years agoMerge branch 'MDL-28349' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 13:28:55 +0000 (15:28 +0200)]
Merge branch 'MDL-28349' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL27951' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 01:09:15 +0000 (03:09 +0200)]
Merge branch 'MDL27951' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'wip_MDL-20804_wsdl' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 01:04:34 +0000 (03:04 +0200)]
Merge branch 'wip_MDL-20804_wsdl' of git://github.com/timhunt/moodle

10 years agoMerge branch 'wip-mdl-27219' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:58:40 +0000 (02:58 +0200)]
Merge branch 'wip-mdl-27219' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-28737' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:51:09 +0000 (02:51 +0200)]
Merge branch 'MDL-28737' of git://github.com/timhunt/moodle

10 years agoRevert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"
Eloy Lafuente (stronk7) [Wed, 17 Aug 2011 00:27:50 +0000 (02:27 +0200)]
Revert "MDL-25757 SCORM fix issue with duplicate cmi values being saved"

This reverts commit 7441c53cc11766d79d6567aee3deb2a286faf342.

10 years agoMerge branch 'MDL-21934' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 23:28:41 +0000 (01:28 +0200)]
Merge branch 'MDL-21934' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-27752' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 23:01:59 +0000 (01:01 +0200)]
Merge branch 'MDL-27752' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:56:28 +0000 (00:56 +0200)]
Merge branch 'MDL-28301-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:44:44 +0000 (00:44 +0200)]
Merge branch 'MDL-28643-master' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:32:23 +0000 (00:32 +0200)]
Merge branch 'master_MDL-28649' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-28652' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:28:43 +0000 (00:28 +0200)]
Merge branch 'MDL-28652' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28653' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:17:14 +0000 (00:17 +0200)]
Merge branch 'MDL-28653' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28654' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:08:59 +0000 (00:08 +0200)]
Merge branch 'MDL-28654' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-28655' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 22:07:19 +0000 (00:07 +0200)]
Merge branch 'MDL-28655' of git://github.com/bostelm/moodle

10 years agoMerge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 21:42:59 +0000 (23:42 +0200)]
Merge branch 'master_MDL-28721' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)]
Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle

10 years agoMerge branch 'MDL-28365' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 11:03:02 +0000 (13:03 +0200)]
Merge branch 'MDL-28365' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-23872_M' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Tue, 16 Aug 2011 09:51:24 +0000 (11:51 +0200)]
Merge branch 'MDL-23872_M' of git://github.com/nebgor/moodle