moodle.git
7 years agoMerge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com...
Dan Poltawski [Tue, 14 Jan 2014 07:36:58 +0000 (15:36 +0800)]
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle

7 years agoMerge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 07:18:37 +0000 (15:18 +0800)]
Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)]
Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)]
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-40918_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)]
Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 14 Jan 2014 06:29:58 +0000 (14:29 +0800)]
Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle

7 years agoMDL-40313 question: build shifter after js changes
Dan Poltawski [Tue, 14 Jan 2014 06:28:15 +0000 (14:28 +0800)]
MDL-40313 question: build shifter after js changes

7 years agoMerge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 06:23:06 +0000 (14:23 +0800)]
Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-40313' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:21:06 +0000 (14:21 +0800)]
Merge branch 'MDL-40313' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:59:26 +0000 (13:59 +0800)]
Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:25:44 +0000 (13:25 +0800)]
Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:18:16 +0000 (13:18 +0800)]
Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:14:09 +0000 (13:14 +0800)]
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:06:54 +0000 (13:06 +0800)]
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle

Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js

7 years agoMDL-40056 events: Replace old add_to_log calls with new events
Ankit Agarwal [Tue, 7 Jan 2014 06:10:20 +0000 (14:10 +0800)]
MDL-40056 events: Replace old add_to_log calls with new events

7 years agoMDL-40056 events: Add unit tests for new events
Ankit Agarwal [Tue, 7 Jan 2014 06:09:43 +0000 (14:09 +0800)]
MDL-40056 events: Add unit tests for new events

7 years agoMDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm
Ankit Agarwal [Tue, 7 Jan 2014 06:06:26 +0000 (14:06 +0800)]
MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm

Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events

7 years agoMerge branch 'MDL-43610-m' of git://github.com/micaherne/moodle
Damyon Wiese [Tue, 14 Jan 2014 03:57:09 +0000 (11:57 +0800)]
Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle

7 years agoMerge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 03:28:39 +0000 (11:28 +0800)]
Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'MDL-43412' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Jan 2014 02:46:22 +0000 (10:46 +0800)]
Merge branch 'MDL-43412' of git://github.com/timhunt/moodle

7 years agoMDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activi...
Damyon Wiese [Tue, 14 Jan 2014 01:57:05 +0000 (09:57 +0800)]
MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore.

7 years agoMerge branch 'MDL-43109' of https://github.com/mdikih/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 20:51:27 +0000 (21:51 +0100)]
Merge branch 'MDL-43109' of https://github.com/mdikih/moodle

7 years agoMDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
Matteo Scaramuccia [Mon, 30 Dec 2013 17:51:25 +0000 (18:51 +0100)]
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().

7 years agoMerge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)]
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-33600-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 15:31:00 +0000 (16:31 +0100)]
Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)]
Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle

7 years agoMDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase
Frederic Massart [Tue, 7 Jan 2014 10:29:39 +0000 (11:29 +0100)]
MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase

7 years agoMerge branch 'MDL-33952-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:55:36 +0000 (12:55 +0800)]
Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle

Conflicts:
mod/assignment/lang/en/assignment.php

7 years agoMerge branch '43598-43262-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:42:13 +0000 (12:42 +0800)]
Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
lib/yui/src/notification/js/dialogue.js

7 years agoMerge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:34:53 +0000 (12:34 +0800)]
Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:11:17 +0000 (12:11 +0800)]
Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch '41226-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:11:10 +0000 (11:11 +0800)]
Merge branch '41226-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '40821-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:02:18 +0000 (11:02 +0800)]
Merge branch '40821-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '40693-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)]
Merge branch '40693-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:03:51 +0000 (10:03 +0800)]
Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-40205 theme: fixed overflow of block headers
Sam Hemelryk [Wed, 8 Jan 2014 01:24:16 +0000 (14:24 +1300)]
MDL-40205 theme: fixed overflow of block headers

7 years agoMerge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 01:35:50 +0000 (09:35 +0800)]
Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)]
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle

7 years agoMDL-43395 dml: warn about invalid limit params
Dan Poltawski [Mon, 16 Dec 2013 05:05:20 +0000 (13:05 +0800)]
MDL-43395 dml: warn about invalid limit params

Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.

7 years agoMDL-43598 dialogue: fixed bug with render procedure
Sam Hemelryk [Tue, 7 Jan 2014 22:47:47 +0000 (11:47 +1300)]
MDL-43598 dialogue: fixed bug with render procedure

7 years agoMDL-43262 JavaScript: Correct use of centered attribute override
Andrew Nicols [Sun, 8 Dec 2013 15:26:59 +0000 (23:26 +0800)]
MDL-43262 JavaScript: Correct use of centered attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-43262 JavaScript: Correct visible attribute override
Andrew Nicols [Sun, 8 Dec 2013 14:54:58 +0000 (22:54 +0800)]
MDL-43262 JavaScript: Correct visible attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-43262 JavaScript: Correct width attribute override
Andrew Nicols [Sun, 8 Dec 2013 14:49:13 +0000 (22:49 +0800)]
MDL-43262 JavaScript: Correct width attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-40821 theme_bootstrapbase: fixed positioning of profile controls
Sam Hemelryk [Tue, 7 Jan 2014 04:52:59 +0000 (17:52 +1300)]
MDL-40821 theme_bootstrapbase: fixed positioning of profile controls

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-40821 theme_bootstrapbase: show the current lang in the menu
Sam Hemelryk [Tue, 7 Jan 2014 04:40:28 +0000 (17:40 +1300)]
MDL-40821 theme_bootstrapbase: show the current lang in the menu

7 years agoMDL-40693 theme_bootstrapbase: changed navbar separator to official separator
Sam Hemelryk [Tue, 7 Jan 2014 05:07:07 +0000 (18:07 +1300)]
MDL-40693 theme_bootstrapbase: changed navbar separator to official separator

7 years agoMDL-43488 remoe city and country requirement from signup
Petr Škoda [Sun, 29 Dec 2013 08:17:52 +0000 (16:17 +0800)]
MDL-43488 remoe city and country requirement from signup

This was supposed to be part of MDL-28558.

7 years agoMDL-43511 do not cache the MUC cache in question code
Petr Škoda [Sun, 29 Dec 2013 07:46:50 +0000 (15:46 +0800)]
MDL-43511 do not cache the MUC cache in question code

7 years agoMDL-43529 delete all unnecessary register_globals checks
Petr Škoda [Thu, 2 Jan 2014 02:04:08 +0000 (10:04 +0800)]
MDL-43529 delete all unnecessary register_globals checks

7 years agoMDL-43646 "disapprove" changed to "undo approval"
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 18:54:10 +0000 (19:54 +0100)]
MDL-43646 "disapprove" changed to "undo approval"

7 years agoMDL-43590 move unapprove to undo approval
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 17:55:17 +0000 (18:55 +0100)]
MDL-43590 move unapprove to undo approval

7 years agoMDL-46310 assign Prevent blind marking submission notification email being sent to...
Michael Aherne [Fri, 10 Jan 2014 12:37:12 +0000 (12:37 +0000)]
MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address

7 years agoMerge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 09:08:34 +0000 (10:08 +0100)]
Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle

7 years agoMDL-42792 SCORM: Prevent JS error when network connection fails. - return false to...
Dan Marsden [Fri, 10 Jan 2014 08:04:54 +0000 (21:04 +1300)]
MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported.

7 years agoMDL-41577 SCORM: remove old IE9 hack that didn't really work.
Dan Marsden [Thu, 26 Sep 2013 02:17:14 +0000 (14:17 +1200)]
MDL-41577 SCORM: remove old IE9 hack that didn't really work.

7 years agoweekly release 2.7dev
Damyon Wiese [Fri, 10 Jan 2014 06:19:48 +0000 (14:19 +0800)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Fri, 10 Jan 2014 06:19:31 +0000 (14:19 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMDL-36721 make upgrade queries cross-db
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 00:03:23 +0000 (01:03 +0100)]
MDL-36721 make upgrade queries cross-db

7 years agoMDL-43178 mod_forum: fixed the digest setting confirmation message
Andrew Davis [Fri, 27 Dec 2013 02:24:19 +0000 (10:24 +0800)]
MDL-43178 mod_forum: fixed the digest setting confirmation message

7 years agoMerge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)]
Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-43349 cache: added back are_requirements_met calls
Sam Hemelryk [Thu, 9 Jan 2014 21:21:37 +0000 (10:21 +1300)]
MDL-43349 cache: added back are_requirements_met calls

7 years agoMDL-40313 question bank search classes should be namespaced.
Tim Hunt [Thu, 9 Jan 2014 12:43:56 +0000 (12:43 +0000)]
MDL-40313 question bank search classes should be namespaced.

7 years agoMDL-40313 Fix code and doc checker warnings.
Tim Hunt [Thu, 9 Jan 2014 11:54:22 +0000 (11:54 +0000)]
MDL-40313 Fix code and doc checker warnings.

7 years agoMDL-40313 questionbank: Add question filtering API
Ray Morris [Wed, 8 Jan 2014 20:08:40 +0000 (14:08 -0600)]
MDL-40313 questionbank: Add question filtering API

Add new API for filtering questions, refactoring the options to display
old questions and include subcategories into new
question_bank_search_condition classes. Make the new API pluggable via
local_[pluginname]_get_question_bank_search_conditions.

7 years agoMDL-43371 mod_lesson: Remove files upon page or module deletion
Frederic Massart [Thu, 9 Jan 2014 15:16:59 +0000 (16:16 +0100)]
MDL-43371 mod_lesson: Remove files upon page or module deletion

7 years agoMDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view
Frederic Massart [Thu, 9 Jan 2014 09:25:53 +0000 (10:25 +0100)]
MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view

7 years agoMerge branch 'MDL-43330_master-skippedexception-namespace' of https://github.com...
Eloy Lafuente (stronk7) [Thu, 9 Jan 2014 09:19:25 +0000 (10:19 +0100)]
Merge branch 'MDL-43330_master-skippedexception-namespace' of https://github.com/dmonllao/moodle

7 years agoMDL-43283 mod_chat: corrected SQL query to follow strict groupping rules
Marina Glancy [Thu, 9 Jan 2014 07:37:38 +0000 (15:37 +0800)]
MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules

7 years agoMDL-43330 behat: Using the tag that includes the exception namespace
David Monllao [Thu, 9 Jan 2014 04:08:21 +0000 (12:08 +0800)]
MDL-43330 behat: Using the tag that includes the exception namespace

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Jan 2014 00:42:11 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoMDL-43590 Merge English strings from the en_fix language pack
Helen Foster [Thu, 9 Jan 2014 00:06:01 +0000 (01:06 +0100)]
MDL-43590 Merge English strings from the en_fix language pack

7 years agoMDL-43412 quiz with grade period and password did not work.
Tim Hunt [Wed, 8 Jan 2014 17:55:25 +0000 (17:55 +0000)]
MDL-43412 quiz with grade period and password did not work.

Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.

7 years agoMDL-40119 Forms: Remove cursor style override for calendar button
Andrew Nicols [Wed, 8 Jan 2014 08:34:27 +0000 (19:34 +1100)]
MDL-40119 Forms: Remove cursor style override for calendar button

7 years agoMDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page
Frederic Massart [Tue, 7 Jan 2014 11:08:44 +0000 (12:08 +0100)]
MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page

7 years agoMerge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 08:55:08 +0000 (09:55 +0100)]
Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle

7 years agoMDL-43423 behat: Increasing the timeout to 6 seconds
David Monllao [Wed, 8 Jan 2014 08:51:17 +0000 (16:51 +0800)]
MDL-43423 behat: Increasing the timeout to 6 seconds

7 years agoMDL-33952 Assignment - bon voyage!
Damyon Wiese [Thu, 19 Dec 2013 05:04:28 +0000 (13:04 +0800)]
MDL-33952 Assignment - bon voyage!

mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.

7 years agoMerge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 8 Jan 2014 06:32:57 +0000 (14:32 +0800)]
Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-43606 tinymce_managefiles: bump version
Marina Glancy [Wed, 8 Jan 2014 05:57:03 +0000 (13:57 +0800)]
MDL-43606 tinymce_managefiles: bump version

to allow smooth upgrade from contributed plugin in 2.5

7 years agoMerge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 8 Jan 2014 03:56:53 +0000 (11:56 +0800)]
Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43532-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 8 Jan 2014 03:43:39 +0000 (11:43 +0800)]
Merge branch 'MDL-43532-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43595-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 8 Jan 2014 03:34:46 +0000 (11:34 +0800)]
Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle

7 years agoMDL-33600 Assign: Add an admin setting to set the default for sendstudentnotifications
Damyon Wiese [Fri, 20 Dec 2013 01:12:07 +0000 (09:12 +0800)]
MDL-33600 Assign: Add an admin setting to set the default for sendstudentnotifications

7 years agoMDL-33600 Assign: Allow teachers to skip notifying students about grade update.
Damyon Wiese [Mon, 16 Dec 2013 03:27:23 +0000 (11:27 +0800)]
MDL-33600 Assign: Allow teachers to skip notifying students about grade update.

7 years agoMDL-43595: The dropdowns for editpdf stopped working due to a recent change.
Damyon Wiese [Wed, 8 Jan 2014 01:15:58 +0000 (09:15 +0800)]
MDL-43595: The dropdowns for editpdf stopped working due to a recent change.

7 years agoMerge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:15:03 +0000 (02:15 +0100)]
Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:09:55 +0000 (02:09 +0100)]
Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)]
Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 00:59:21 +0000 (01:59 +0100)]
Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 00:32:28 +0000 (01:32 +0100)]
Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 8 Jan 2014 00:21:06 +0000 (08:21 +0800)]
Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara...
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:45:51 +0000 (00:45 +0100)]
Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle

7 years agoMerge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:39:15 +0000 (00:39 +0100)]
Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:23:40 +0000 (00:23 +0100)]
Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:13:28 +0000 (00:13 +0100)]
Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle

7 years agoMerge branch '23837-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:42:55 +0000 (23:42 +0100)]
Merge branch '23837-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:40:51 +0000 (23:40 +0100)]
Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 22:32:38 +0000 (23:32 +0100)]
Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 7 Jan 2014 09:28:15 +0000 (17:28 +0800)]
Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle