moodle.git
7 years agoMerge branch 'MDL-45650_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 May 2014 01:59:08 +0000 (13:59 +1200)]
Merge branch 'MDL-45650_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 26 May 2014 01:23:02 +0000 (13:23 +1200)]
Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-45660' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 25 May 2014 23:52:32 +0000 (11:52 +1200)]
Merge branch 'MDL-45660' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-45686' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Sun, 25 May 2014 22:55:11 +0000 (10:55 +1200)]
Merge branch 'MDL-45686' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)]
Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'master_MDL-45623' of git://github.com/totara/moodle
Sam Hemelryk [Sun, 25 May 2014 21:58:48 +0000 (09:58 +1200)]
Merge branch 'master_MDL-45623' of git://github.com/totara/moodle

7 years agoMerge branch 'MDL-45607_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 25 May 2014 21:53:41 +0000 (09:53 +1200)]
Merge branch 'MDL-45607_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)]
Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle
Sam Hemelryk [Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)]
Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle

7 years agoMDL-45686 qtype_multichoice get_num_selected_choices return wrong result
Jean-Michel Vedrine [Fri, 23 May 2014 21:08:36 +0000 (23:08 +0200)]
MDL-45686 qtype_multichoice get_num_selected_choices return wrong result

7 years agoMDL-45635 javascript: Make core dialogue translatable
Andrew Nicols [Fri, 23 May 2014 08:01:48 +0000 (16:01 +0800)]
MDL-45635 javascript: Make core dialogue translatable

7 years agoMDL-45660 question statistics: make comparison more robust.
Tim Hunt [Thu, 22 May 2014 15:13:00 +0000 (16:13 +0100)]
MDL-45660 question statistics: make comparison more robust.

7 years agoweekly on-sync release 2.8dev
Eloy Lafuente (stronk7) [Thu, 22 May 2014 15:03:23 +0000 (17:03 +0200)]
weekly on-sync release 2.8dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 22 May 2014 15:03:19 +0000 (17:03 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMDL-42526 mod_assignment : fix record insert with assigment.id 0
James Pratt [Thu, 22 May 2014 05:10:07 +0000 (12:10 +0700)]
MDL-42526 mod_assignment : fix record insert with assigment.id 0

7 years agoMerge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 22 May 2014 04:59:56 +0000 (12:59 +0800)]
Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle

7 years agoMDL-45239 editor_atto: On Android do not restore focus in the callbackWrapper
Andrew Nicols [Thu, 22 May 2014 03:55:00 +0000 (11:55 +0800)]
MDL-45239 editor_atto: On Android do not restore focus in the callbackWrapper

It seems that Android automatically focuses the cursor in the last position
when the content editable region is programatically re-focused.

Whilst this does not cause an issue on it's own, when combined with the
behaviour of the dictionary auto-completion to restore focus on the start
of the word when a word has not yet been finished, this was causing us to
change focus when pressing buttons.

7 years agoMDL-45536 atto_html: Update the textarea size when switching to HTML view
Andrew Nicols [Thu, 22 May 2014 02:47:32 +0000 (10:47 +0800)]
MDL-45536 atto_html: Update the textarea size when switching to HTML view

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 22 May 2014 01:07:56 +0000 (01:07 +0000)]
Automatically generated installer lang files

7 years agoMDL-45654 cron: fix non-empty directories deletion
Rod Norfor [Wed, 21 May 2014 16:12:02 +0000 (17:12 +0100)]
MDL-45654 cron: fix non-empty directories deletion

Remove errors when attempting to delete non-empty directories when
child directories do not get removed since the mtime was updated when
files were removed from the child directory.

7 years agoMDL-44711 course: fixed navigation expansion in course tests
Sam Hemelryk [Wed, 21 May 2014 08:58:16 +0000 (20:58 +1200)]
MDL-44711 course: fixed navigation expansion in course tests

7 years agoMDL-45650 events: ensure correct objectid passed when triggering user_profile_viewed...
Mark Nelson [Wed, 21 May 2014 07:25:17 +0000 (00:25 -0700)]
MDL-45650 events: ensure correct objectid passed when triggering user_profile_viewed event

7 years agoMDL-45469 profile: make sure profile fields can be initialised without arguments
Marina Glancy [Wed, 21 May 2014 03:40:12 +0000 (11:40 +0800)]
MDL-45469 profile: make sure profile fields can be initialised without arguments

7 years agoMerge branch 'wip-MDL-45371-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 21 May 2014 02:03:05 +0000 (10:03 +0800)]
Merge branch 'wip-MDL-45371-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-45320 behat: change to block selector
Marina Glancy [Tue, 20 May 2014 10:53:06 +0000 (18:53 +0800)]
MDL-45320 behat: change to block selector

7 years agoMDL-45320 block_html: behat tests
Marina Glancy [Sun, 4 May 2014 04:46:47 +0000 (12:46 +0800)]
MDL-45320 block_html: behat tests

7 years agoMDL-45320 behat: Step definitions for blocks
Marina Glancy [Sun, 4 May 2014 04:44:27 +0000 (12:44 +0800)]
MDL-45320 behat: Step definitions for blocks

7 years agoMDL-45294 behat: Updating block references to aria label value
David Monllao [Tue, 13 May 2014 11:56:36 +0000 (18:56 +0700)]
MDL-45294 behat: Updating block references to aria label value

Also improving moodle selectors xpath expressions
readability.

7 years agoMDL-45294 behat: Supporting an aria-label as a block ref
David Monllao [Mon, 28 Apr 2014 12:44:15 +0000 (19:44 +0700)]
MDL-45294 behat: Supporting an aria-label as a block ref

7 years agoMerge branch '44711-28-r2' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 May 2014 12:32:14 +0000 (20:32 +0800)]
Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle

7 years agoMDL-44711 block_navigation: fixed typo in behat tests
Sam Hemelryk [Tue, 20 May 2014 10:07:29 +0000 (22:07 +1200)]
MDL-44711 block_navigation: fixed typo in behat tests

7 years agoMDL-45606 Unit test fix for MySQL and added a comment about the removed code.
Damyon Wiese [Tue, 20 May 2014 10:01:32 +0000 (18:01 +0800)]
MDL-45606 Unit test fix for MySQL and added a comment about the removed code.

7 years agoMerge branch 'MDL-45496-m' of https://github.com/micaherne/moodle
Dan Poltawski [Tue, 20 May 2014 07:54:25 +0000 (15:54 +0800)]
Merge branch 'MDL-45496-m' of https://github.com/micaherne/moodle

7 years agoMDL-45563 message: Inverting IDs in description of event message_viewed
Frederic Massart [Thu, 15 May 2014 08:17:03 +0000 (16:17 +0800)]
MDL-45563 message: Inverting IDs in description of event message_viewed

7 years agoMerge branch 'MDL-45618' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 20 May 2014 06:59:48 +0000 (14:59 +0800)]
Merge branch 'MDL-45618' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-45525-27' of git://github.com/jethac/moodle
Marina Glancy [Tue, 20 May 2014 06:28:36 +0000 (14:28 +0800)]
Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 20 May 2014 06:25:10 +0000 (14:25 +0800)]
Merge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip-MDL-45512-master' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 20 May 2014 06:21:56 +0000 (14:21 +0800)]
Merge branch 'wip-MDL-45512-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-43669-m' of git://github.com/micaherne/moodle
Marina Glancy [Tue, 20 May 2014 06:12:38 +0000 (14:12 +0800)]
Merge branch 'MDL-43669-m' of git://github.com/micaherne/moodle

7 years agoMerge branch 'MDL-44333' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 20 May 2014 06:10:03 +0000 (14:10 +0800)]
Merge branch 'MDL-44333' of git://github.com/timhunt/moodle

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

7 years agoMerge branch 'master_MDL-45583' of github.com:danmarsden/moodle
Damyon Wiese [Tue, 20 May 2014 05:31:06 +0000 (13:31 +0800)]
Merge branch 'master_MDL-45583' of github.com:danmarsden/moodle

7 years agoMerge branch 'MDL-45323-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 20 May 2014 05:27:48 +0000 (13:27 +0800)]
Merge branch 'MDL-45323-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 20 May 2014 05:23:35 +0000 (13:23 +0800)]
Merge branch 'MDL-45501-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-45566 message: Send blocking events when user is not in contact list
Frederic Massart [Thu, 15 May 2014 08:08:46 +0000 (16:08 +0800)]
MDL-45566 message: Send blocking events when user is not in contact list

7 years agoMerge branch 'MDL-45476-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 20 May 2014 05:06:09 +0000 (13:06 +0800)]
Merge branch 'MDL-45476-master' of git://github.com/phalacee/moodle

7 years agoMDL-45545 csslib: Chunking handles commas in media query definitions
Frederic Massart [Wed, 14 May 2014 07:15:42 +0000 (15:15 +0800)]
MDL-45545 csslib: Chunking handles commas in media query definitions

7 years agoMDL-45469 Move profile tests to the location recognised by phpunit
Marina Glancy [Tue, 20 May 2014 03:43:48 +0000 (11:43 +0800)]
MDL-45469 Move profile tests to the location recognised by phpunit

7 years agoMerge branch 'wip-MDL-45466-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 20 May 2014 03:51:53 +0000 (11:51 +0800)]
Merge branch 'wip-MDL-45466-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 20 May 2014 03:42:32 +0000 (15:42 +1200)]
Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-44027 groups: remove some junk html
Dan Poltawski [Tue, 13 May 2014 08:17:14 +0000 (16:17 +0800)]
MDL-44027 groups: remove some junk html

7 years agoMerge branch 'MDL-45605-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 20 May 2014 02:51:16 +0000 (10:51 +0800)]
Merge branch 'MDL-45605-master' of git://github.com/damyon/moodle

7 years agoMDL-45546 mod_forum: Login the user before getting its context
Frederic Massart [Wed, 14 May 2014 08:16:40 +0000 (16:16 +0800)]
MDL-45546 mod_forum: Login the user before getting its context

7 years agoMerge branch '44711-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 20 May 2014 02:15:11 +0000 (10:15 +0800)]
Merge branch '44711-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)]
Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 20 May 2014 01:52:25 +0000 (09:52 +0800)]
Merge branch 'MDL-45469-master' of git://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-44449' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 20 May 2014 01:50:43 +0000 (09:50 +0800)]
Merge branch 'MDL-44449' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 20 May 2014 01:30:19 +0000 (09:30 +0800)]
Merge branch 'MDL-45550-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 20 May 2014 01:09:34 +0000 (13:09 +1200)]
Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch '44974-28' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 20 May 2014 00:49:56 +0000 (08:49 +0800)]
Merge branch '44974-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 20 May 2014 00:07:12 +0000 (12:07 +1200)]
Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 19 May 2014 23:58:12 +0000 (11:58 +1200)]
Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 19 May 2014 23:55:35 +0000 (11:55 +1200)]
Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)]
Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle

7 years agoMDL-45474 atto_undo: Remove notice when undo stack is empty
Frederic Massart [Tue, 13 May 2014 09:49:26 +0000 (17:49 +0800)]
MDL-45474 atto_undo: Remove notice when undo stack is empty

7 years agoMerge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 19 May 2014 22:42:09 +0000 (10:42 +1200)]
Merge branch 'MDL-37838-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-45623: Fix assigned users count on role delete confirmation page
Simon Coggins [Mon, 19 May 2014 22:01:00 +0000 (10:01 +1200)]
MDL-45623: Fix assigned users count on role delete confirmation page

7 years agoMerge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 19 May 2014 20:52:54 +0000 (08:52 +1200)]
Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 19 May 2014 20:47:16 +0000 (08:47 +1200)]
Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-45618 Fix @since PHPdoc tags.
Tim Hunt [Mon, 19 May 2014 16:03:04 +0000 (17:03 +0100)]
MDL-45618 Fix @since PHPdoc tags.

7 years agoMDL-44449 quiz access rules should have a delete hook.
Tim Hunt [Fri, 9 May 2014 13:20:17 +0000 (14:20 +0100)]
MDL-44449 quiz access rules should have a delete hook.

So they can clean up their settings when the quiz is deleted.

See
https://github.com/moodleou/moodle-quizaccess_honestycheck/commit/babf149c2cc6dd734c272cd332b2032cc19db7d8
for an example of using this.

7 years agoMerge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 13:20:10 +0000 (21:20 +0800)]
Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 19 May 2014 12:52:19 +0000 (20:52 +0800)]
Merge branch 'MDL-45472-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 12:18:59 +0000 (20:18 +0800)]
Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43833' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 19 May 2014 12:11:50 +0000 (20:11 +0800)]
Merge branch 'MDL-43833' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 12:04:50 +0000 (20:04 +0800)]
Merge branch 'MDL-45527-27' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-45455' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 19 May 2014 11:54:42 +0000 (19:54 +0800)]
Merge branch 'MDL-45455' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Mon, 19 May 2014 10:43:15 +0000 (18:43 +0800)]
Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle

7 years agoMDL-45469 Conditional availability: Restrict by text area broken
sam marshall [Thu, 8 May 2014 12:41:27 +0000 (13:41 +0100)]
MDL-45469 Conditional availability: Restrict by text area broken

It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field.

7 years agoMerge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Mon, 19 May 2014 09:29:27 +0000 (17:29 +0800)]
Merge branch 'MDL-45478-master' of git://github.com/sammarshallou/moodle

7 years agoMDL-43669 messaging Enable sending email only from no-reply address
Michael Aherne [Wed, 16 Apr 2014 11:20:25 +0000 (12:20 +0100)]
MDL-43669 messaging Enable sending email only from no-reply address

7 years agoMDL-45239 editor_atto: The editor cannot be active if it is not the active element
Andrew Nicols [Thu, 8 May 2014 06:31:46 +0000 (14:31 +0800)]
MDL-45239 editor_atto: The editor cannot be active if it is not the active element

FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMDL-45468 editor_atto: Check that the common ancestor is within the editor
Andrew Nicols [Thu, 8 May 2014 06:36:16 +0000 (14:36 +0800)]
MDL-45468 editor_atto: Check that the common ancestor is within the editor

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMDL-45371 behat: Tests for block glossary_random
Marina Glancy [Fri, 2 May 2014 02:25:59 +0000 (10:25 +0800)]
MDL-45371 behat: Tests for block glossary_random

7 years agoMerge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 19 May 2014 07:07:36 +0000 (15:07 +0800)]
Merge branch 'MDL-41109-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-MDL-34914-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 19 May 2014 06:58:49 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-34914-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-45466 forum: performance improvement for mass (un)subscriptions
Marina Glancy [Mon, 19 May 2014 05:37:05 +0000 (13:37 +0800)]
MDL-45466 forum: performance improvement for mass (un)subscriptions

7 years agoMDL-32543 upgrade: Increment the version bump
Damyon Wiese [Mon, 19 May 2014 05:01:39 +0000 (13:01 +0800)]
MDL-32543 upgrade: Increment the version bump

Conflicts:
version.php

7 years agoMerge branch 'MDL-32543' of https://github.com/danielneis/moodle
Damyon Wiese [Mon, 19 May 2014 05:02:48 +0000 (13:02 +0800)]
Merge branch 'MDL-32543' of https://github.com/danielneis/moodle

Conflicts:
version.php

7 years agoMerge branch 'MDL-23566' of https://github.com/aolley/moodle
Damyon Wiese [Mon, 19 May 2014 04:45:21 +0000 (12:45 +0800)]
Merge branch 'MDL-23566' of https://github.com/aolley/moodle

7 years agoMDL-45537 mod_assign: Requiring locallib for class assign
Frederic Massart [Thu, 15 May 2014 07:52:48 +0000 (15:52 +0800)]
MDL-45537 mod_assign: Requiring locallib for class assign

7 years agoMerge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle
Marina Glancy [Mon, 19 May 2014 04:37:10 +0000 (12:37 +0800)]
Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle

7 years agoMerge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 19 May 2014 04:25:56 +0000 (12:25 +0800)]
Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle
Damyon Wiese [Mon, 19 May 2014 04:08:24 +0000 (12:08 +0800)]
Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle

7 years agoMDL-45607 events: changed the context passed to the user_profile_viewed event
Mark Nelson [Mon, 19 May 2014 03:54:13 +0000 (20:54 -0700)]
MDL-45607 events: changed the context passed to the user_profile_viewed event

7 years agoMDL-45605 Phpunit: Do not call gc_collect_cycles as part of reset.
Damyon Wiese [Mon, 19 May 2014 02:10:59 +0000 (10:10 +0800)]
MDL-45605 Phpunit: Do not call gc_collect_cycles as part of reset.

This takes 25% of the time in running tests and there is no benefit. The
behaviour of destructors is the same before/after the patch.

7 years agoMerge branch 'MDL-45561-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 19 May 2014 01:37:12 +0000 (13:37 +1200)]
Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle

7 years agoMDL-44974 admin: repositioned call to initialise renderer
Sam Hemelryk [Mon, 7 Apr 2014 03:56:40 +0000 (15:56 +1200)]
MDL-44974 admin: repositioned call to initialise renderer

7 years agoMDL-44711 navigation: better handling of course expansion exception
Sam Hemelryk [Mon, 12 May 2014 23:18:47 +0000 (11:18 +1200)]
MDL-44711 navigation: better handling of course expansion exception

7 years agoMDL-45603 cache Fix the mappingsonly option to work as advertised.
Eric Merrill [Sun, 18 May 2014 03:46:44 +0000 (23:46 -0400)]
MDL-45603 cache Fix the mappingsonly option to work as advertised.