integration.git
7 years agoMoodle release 3.2.9 MOODLE_32_STABLE v3.2.9
Eloy Lafuente (stronk7) [Wed, 16 May 2018 16:42:08 +0000 (18:42 +0200)]
Moodle release 3.2.9

7 years agoMDL-62469 qtype_calculated: check remaining placeholders, see MDL-62275
Marina Glancy [Wed, 16 May 2018 07:25:11 +0000 (15:25 +0800)]
MDL-62469 qtype_calculated: check remaining placeholders, see MDL-62275

7 years agoweekly release 3.2.8+
David Monllao [Tue, 15 May 2018 07:42:25 +0000 (09:42 +0200)]
weekly release 3.2.8+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
David Monllao [Tue, 15 May 2018 07:42:24 +0000 (09:42 +0200)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 15 May 2018 00:06:53 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 13 May 2018 00:07:11 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoMDL-62275 qtype_calculatedmulti: Fix typo
Eloy Lafuente (stronk7) [Fri, 11 May 2018 19:16:41 +0000 (21:16 +0200)]
MDL-62275 qtype_calculatedmulti: Fix typo

7 years agoMDL-62275 qtype_calc*: improve validation of formulae
Tim Hunt [Mon, 30 Apr 2018 18:45:47 +0000 (19:45 +0100)]
MDL-62275 qtype_calc*: improve validation of formulae

Many thanks to Marina Glancy for helping with this.

7 years agoMDL-62206 blocks: do not add fixed form elements as hidden
Marina Glancy [Wed, 9 May 2018 10:38:24 +0000 (18:38 +0800)]
MDL-62206 blocks: do not add fixed form elements as hidden

7 years agoMDL-62210 mod_assign: limit file lookup to the target assign
Adam Olley [Tue, 8 May 2018 09:01:53 +0000 (17:01 +0800)]
MDL-62210 mod_assign: limit file lookup to the target assign

7 years agoMDL-62210 mod_assign: improved validation in portfolio caller class
Brendan Cox [Tue, 8 May 2018 08:50:49 +0000 (16:50 +0800)]
MDL-62210 mod_assign: improved validation in portfolio caller class

7 years agoMDL-62232 mod_forum: PHPUnit 5.5 needs expectException()
Jun Pataleta [Wed, 9 May 2018 08:56:47 +0000 (16:56 +0800)]
MDL-62232 mod_forum: PHPUnit 5.5 needs expectException()

7 years agoMDL-62232 mod_forum: Additional tests for portfolio file export
Brendan Cox [Thu, 26 Apr 2018 23:46:13 +0000 (11:46 +1200)]
MDL-62232 mod_forum: Additional tests for portfolio file export

7 years agoMDL-62232 mod_forum: Limit portfolio to files belonging to the post
Adam Olley [Mon, 30 Apr 2018 03:27:24 +0000 (12:57 +0930)]
MDL-62232 mod_forum: Limit portfolio to files belonging to the post

7 years agoMDL-62233 portfolio: check caller parent class
Marina Glancy [Mon, 7 May 2018 04:53:40 +0000 (12:53 +0800)]
MDL-62233 portfolio: check caller parent class

7 years agoMDL-61996 core: when loggedin always check user is complete
Marina Glancy [Mon, 16 Apr 2018 07:29:03 +0000 (15:29 +0800)]
MDL-61996 core: when loggedin always check user is complete

7 years agoweekly release 3.2.8+
Jun Pataleta [Wed, 9 May 2018 04:01:04 +0000 (12:01 +0800)]
weekly release 3.2.8+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Jun Pataleta [Wed, 9 May 2018 04:01:03 +0000 (12:01 +0800)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMerge branch 'MDL-62280-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
Jake Dallimore [Thu, 3 May 2018 02:54:22 +0000 (10:54 +0800)]
Merge branch 'MDL-62280-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 May 2018 00:06:55 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoMDL-62280 xhprof: Support tideways_xhprof
Andrew Nicols [Tue, 1 May 2018 01:30:46 +0000 (09:30 +0800)]
MDL-62280 xhprof: Support tideways_xhprof

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 1 May 2018 00:07:31 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 30 Apr 2018 00:06:54 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 16 Apr 2018 00:07:41 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 11 Apr 2018 00:07:45 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 31 Mar 2018 00:07:36 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoweekly release 3.2.8+
Jun Pataleta [Thu, 29 Mar 2018 04:55:51 +0000 (12:55 +0800)]
weekly release 3.2.8+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Jun Pataleta [Thu, 29 Mar 2018 04:55:50 +0000 (12:55 +0800)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMerge branch 'MDL-61770-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
Jake Dallimore [Wed, 28 Mar 2018 05:34:16 +0000 (13:34 +0800)]
Merge branch 'MDL-61770-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

7 years agoMDL-61770 iplookup: Check types rather than values
Andrew Nicols [Wed, 28 Mar 2018 01:05:23 +0000 (09:05 +0800)]
MDL-61770 iplookup: Check types rather than values

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 25 Mar 2018 00:06:47 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 21 Mar 2018 00:06:34 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 20 Mar 2018 00:06:34 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 20 Mar 2018 00:06:33 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoMoodle release 3.2.8 v3.2.8
Eloy Lafuente (stronk7) [Sat, 17 Mar 2018 00:18:24 +0000 (01:18 +0100)]
Moodle release 3.2.8

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Eloy Lafuente (stronk7) [Sat, 17 Mar 2018 00:18:21 +0000 (01:18 +0100)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMerge branch 'MDL-61600-32' of git://github.com/dpalou/moodle into MOODLE_32_STABLE
Eloy Lafuente (stronk7) [Wed, 14 Mar 2018 13:43:59 +0000 (14:43 +0100)]
Merge branch 'MDL-61600-32' of git://github.com/dpalou/moodle into MOODLE_32_STABLE

7 years agoMDL-61600 recaptcha: Create a script to display recaptcha
Dani Palou [Tue, 6 Mar 2018 15:05:55 +0000 (16:05 +0100)]
MDL-61600 recaptcha: Create a script to display recaptcha

7 years agoMDL-61392 enrol_paypal: Improve IPN input parameters checking
David Mudrák [Thu, 15 Feb 2018 11:50:46 +0000 (12:50 +0100)]
MDL-61392 enrol_paypal: Improve IPN input parameters checking

7 years agoMDL-61392 enrol_paypal: Improve the IPN notifications handling
David Mudrák [Thu, 15 Feb 2018 09:28:31 +0000 (10:28 +0100)]
MDL-61392 enrol_paypal: Improve the IPN notifications handling

* Notify administrators once incoming IPN request is verified by PayPal.
* Fix the HTTP status as expected by the IPN protocol.

7 years agoMerge branch 'MDL-48501-mdl32' of git://github.com/jswebster/moodle into MOODLE_32_STABLE
Eloy Lafuente (stronk7) [Mon, 12 Mar 2018 22:51:19 +0000 (23:51 +0100)]
Merge branch 'MDL-48501-mdl32' of git://github.com/jswebster/moodle into MOODLE_32_STABLE

7 years agoMDL-48501 auth/email: update external class to use reCAPTCHA v2
Jeff Webster [Tue, 6 Mar 2018 00:25:35 +0000 (19:25 -0500)]
MDL-48501 auth/email: update external class to use reCAPTCHA v2

7 years agoMDL-48501 mod_feedback: update feedback to use reCAPTCHA v2
Jeff Webster [Sun, 4 Mar 2018 06:25:30 +0000 (01:25 -0500)]
MDL-48501 mod_feedback: update feedback to use reCAPTCHA v2

7 years agoMDL-48501 login: update signup_form to use reCAPTCHA v2
Jeff Webster [Sun, 4 Mar 2018 06:25:30 +0000 (01:25 -0500)]
MDL-48501 login: update signup_form to use reCAPTCHA v2

7 years agoMDL-48501 form/recaptcha: update to use reCAPTCHA v2
Jeff Webster [Sun, 4 Mar 2018 06:25:30 +0000 (01:25 -0500)]
MDL-48501 form/recaptcha: update to use reCAPTCHA v2

7 years agoMDL-48501 recaptchalib_v2: add new lib to support reCAPTCHA v2
Jeff Webster [Sun, 4 Mar 2018 06:25:29 +0000 (01:25 -0500)]
MDL-48501 recaptchalib_v2: add new lib to support reCAPTCHA v2

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 7 Mar 2018 00:06:50 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoMDL-48501 lang: update reCAPTCHA language strings
Jeff Webster [Sun, 4 Mar 2018 06:25:21 +0000 (01:25 -0500)]
MDL-48501 lang: update reCAPTCHA language strings

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 19 Feb 2018 00:06:46 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 17 Feb 2018 00:06:49 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoweekly release 3.2.7+
David Monllao [Thu, 8 Feb 2018 16:40:24 +0000 (17:40 +0100)]
weekly release 3.2.7+

7 years agoMerge branch 'MDL-61269_32' of git://github.com/stronk7/moodle into MOODLE_32_STABLE
Andrew Nicols [Mon, 5 Feb 2018 09:54:50 +0000 (17:54 +0800)]
Merge branch 'MDL-61269_32' of git://github.com/stronk7/moodle into MOODLE_32_STABLE

7 years agoMDL-61269 composer: better license GPL-3.0-or-later
Eloy Lafuente (stronk7) [Sun, 4 Feb 2018 18:38:32 +0000 (19:38 +0100)]
MDL-61269 composer: better license GPL-3.0-or-later

Source: https://spdx.org/licenses/

7 years agoweekly release 3.2.7+
David Monllao [Thu, 1 Feb 2018 13:26:50 +0000 (14:26 +0100)]
weekly release 3.2.7+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
David Monllao [Thu, 1 Feb 2018 13:26:49 +0000 (14:26 +0100)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 1 Feb 2018 00:07:09 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoMDL-61242 repository_equella: Fix missing class repository
David Mudrák [Wed, 31 Jan 2018 22:05:22 +0000 (23:05 +0100)]
MDL-61242 repository_equella: Fix missing class repository

The call to the class 'repository' introduced in the commit d05c2ac7cc78
didn't fully work and threw: "Exception - Class 'repository' not found".
This fixes the missing library inclusion.

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 31 Jan 2018 00:06:55 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 30 Jan 2018 00:06:55 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'wip-MDL-61242-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE
Eloy Lafuente (stronk7) [Mon, 29 Jan 2018 00:51:47 +0000 (01:51 +0100)]
Merge branch 'wip-MDL-61242-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE

7 years agoweekly release 3.2.7+
Andrew Nicols [Mon, 29 Jan 2018 03:01:19 +0000 (11:01 +0800)]
weekly release 3.2.7+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Andrew Nicols [Mon, 29 Jan 2018 03:01:17 +0000 (11:01 +0800)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMDL-61269 behat-extension: bump to fix some caps & defaults
Eloy Lafuente (stronk7) [Wed, 24 Jan 2018 23:39:06 +0000 (00:39 +0100)]
MDL-61269 behat-extension: bump to fix some caps & defaults

7 years agoMDL-61242 repository_equella: Add source key when sending the source.
Adrian Greeve [Sat, 20 Jan 2018 02:56:18 +0000 (10:56 +0800)]
MDL-61242 repository_equella: Add source key when sending the source.

A thank you to Nelson Cheng for find this issue and suggesting a patch.

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 19 Jan 2018 00:07:22 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 17 Jan 2018 00:06:48 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-61221-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
Jun Pataleta [Tue, 16 Jan 2018 15:01:56 +0000 (23:01 +0800)]
Merge branch 'MDL-61221-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

7 years agoMDL-61221 badges: Ignore site availabilty for behat
Andrew Nicols [Tue, 16 Jan 2018 05:21:47 +0000 (13:21 +0800)]
MDL-61221 badges: Ignore site availabilty for behat

Behat sites should not be available publically, and the check against
the backpack API for site availablity can time out in some situations.

We should be testing as though the site _is_ available, as this is the
standard expectation.

7 years agoMerge branch 'MDL-61204-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
Eloy Lafuente (stronk7) [Tue, 16 Jan 2018 01:17:22 +0000 (02:17 +0100)]
Merge branch 'MDL-61204-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

7 years agoMDL-61204 user: Fix random failure in behat
Andrew Nicols [Fri, 12 Jan 2018 01:34:20 +0000 (09:34 +0800)]
MDL-61204 user: Fix random failure in behat

We need to get into the habit of not using usernames like 'student1'
and 'student10' as our matches are non-strict, and the tests become
dependent upon DB sort order.

This change adds a character after the varying value to act as a
delimter for all of these tests.

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 16 Jan 2018 00:07:01 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoMoodle release 3.2.7 v3.2.7
Eloy Lafuente (stronk7) [Fri, 12 Jan 2018 19:35:36 +0000 (20:35 +0100)]
Moodle release 3.2.7

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Eloy Lafuente (stronk7) [Fri, 12 Jan 2018 19:35:34 +0000 (20:35 +0100)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMDL-61143 core_files: Don't append dot when checking domain names or IP addresses.
Cameron Ball [Wed, 10 Jan 2018 06:57:29 +0000 (14:57 +0800)]
MDL-61143 core_files: Don't append dot when checking domain names or IP addresses.

Previously we appended a dot at the end of IP addresses and domain names in the
cURL security helper, but it causes issues with Google OAuth so this patch removes it.

7 years agoMDL-61131 repositories: Added a key to verify incoming urls.
Adrian Greeve [Mon, 8 Jan 2018 00:36:47 +0000 (08:36 +0800)]
MDL-61131 repositories: Added a key to verify incoming urls.

7 years agoMDL-61143 core_files: Update unit tests for curl_security_helper
Cameron Ball [Wed, 3 Jan 2018 08:10:37 +0000 (16:10 +0800)]
MDL-61143 core_files: Update unit tests for curl_security_helper

Previously some of the unit tests were passing "by accident" becuase
we had the security helper letting through domains where the DNS lookup
failed. That behaviour has changed and now such domains are blocked.

Additionally tests for domains with multiple A records and weird Unicode
stuff have been added.

This patch also mocks the DNS resolution in the test, rather than actually
resolving the domain.

7 years agoMDL-61143 core_files: Block hosts that cannot be determined to be an IP address of...
Cameron Ball [Wed, 3 Jan 2018 08:09:49 +0000 (16:09 +0800)]
MDL-61143 core_files: Block hosts that cannot be determined to be an IP address of domain name

Freaky deaky Unicode/octal/hex domains can be resolved by cURL but are technically not valid.

This patch causes anything that Moodle does not consider to be a valid domain or IP to be blocked
by the cURL security helper.

7 years agoMDL-61143 core_files: Check all A records when testing blocked IPs
Cameron Ball [Tue, 2 Jan 2018 06:42:09 +0000 (14:42 +0800)]
MDL-61143 core_files: Check all A records when testing blocked IPs

7 years agoMDL-60908 mod_quiz: Return question state only when configured
Juan Leyva [Thu, 7 Dec 2017 18:07:27 +0000 (19:07 +0100)]
MDL-60908 mod_quiz: Return question state only when configured

The question state should be returned following the quiz review options
settings.

7 years agoMDL-60235 core_calendar: clean event name field
Simey Lameze [Tue, 12 Dec 2017 04:26:06 +0000 (12:26 +0800)]
MDL-60235 core_calendar: clean event name field

7 years agoMerge branch 'MDL-61169-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE
David Monllao [Mon, 8 Jan 2018 13:59:19 +0000 (14:59 +0100)]
Merge branch 'MDL-61169-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

7 years agoMDL-61169 iplookup: Change to github.com IP
Andrew Nicols [Mon, 8 Jan 2018 09:13:06 +0000 (17:13 +0800)]
MDL-61169 iplookup: Change to github.com IP

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 4 Jan 2018 00:07:24 +0000 (00:07 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 3 Jan 2018 00:06:45 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 18 Dec 2017 00:06:39 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Dec 2017 00:06:31 +0000 (00:06 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 8 Dec 2017 00:10:14 +0000 (00:10 +0000)]
Automatically generated installer lang files

7 years agoweekly release 3.2.6+
Jun Pataleta [Thu, 7 Dec 2017 20:10:00 +0000 (09:10 +1300)]
weekly release 3.2.6+

7 years agoMerge branch 'MDL-59159_32' of git://github.com/stronk7/moodle into MOODLE_32_STABLE
Andrew Nicols [Wed, 6 Dec 2017 02:05:49 +0000 (10:05 +0800)]
Merge branch 'MDL-59159_32' of git://github.com/stronk7/moodle into MOODLE_32_STABLE

7 years agoMDL-59159 environment: 3.1 (LTS) required
Eloy Lafuente (stronk7) [Sun, 3 Dec 2017 23:27:53 +0000 (00:27 +0100)]
MDL-59159 environment: 3.1 (LTS) required

7 years agoMDL-59159 environment: 3.5 base information
Eloy Lafuente (stronk7) [Sun, 3 Dec 2017 23:23:28 +0000 (00:23 +0100)]
MDL-59159 environment: 3.5 base information

This is a direct copy of the 3.4 branch to
have changes under control easier in next commits.

7 years agoweekly release 3.2.6+
David Monllao [Thu, 23 Nov 2017 12:35:13 +0000 (13:35 +0100)]
weekly release 3.2.6+

7 years agoMDL-60436 blocks: Unit test for dashboard block positioning
Neill Magill [Tue, 14 Nov 2017 11:46:22 +0000 (11:46 +0000)]
MDL-60436 blocks: Unit test for dashboard block positioning

7 years agoMDL-60436 blocks: Improve performance of block loading
Neill Magill [Wed, 11 Oct 2017 13:37:53 +0000 (14:37 +0100)]
MDL-60436 blocks: Improve performance of block loading

7 years agoMoodle release 3.2.6 v3.2.6
Eloy Lafuente (stronk7) [Sat, 11 Nov 2017 18:29:31 +0000 (19:29 +0100)]
Moodle release 3.2.6

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 11 Nov 2017 00:05:56 +0000 (00:05 +0000)]
Automatically generated installer lang files

7 years agoweekly release 3.2.5+
David Monllao [Fri, 10 Nov 2017 14:15:20 +0000 (15:15 +0100)]
weekly release 3.2.5+

7 years agoMerge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
David Monllao [Fri, 10 Nov 2017 14:15:19 +0000 (15:15 +0100)]
Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE

7 years agoMerge branch 'MDL-60771-32' of git://github.com/lameze/moodle into MOODLE_32_STABLE
Jun Pataleta [Fri, 10 Nov 2017 05:03:08 +0000 (18:03 +1300)]
Merge branch 'MDL-60771-32' of git://github.com/lameze/moodle into MOODLE_32_STABLE

7 years agoMerge branch 'MDL-60749-32' of git://github.com/sarjona/moodle into MOODLE_32_STABLE
Damyon Wiese [Fri, 10 Nov 2017 04:06:56 +0000 (12:06 +0800)]
Merge branch 'MDL-60749-32' of git://github.com/sarjona/moodle into MOODLE_32_STABLE