moodle.git
4 years agoweekly release 3.3dev
Dan Poltawski [Fri, 6 Jan 2017 01:30:49 +0000 (01:30 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 6 Jan 2017 01:30:48 +0000 (01:30 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-57580 mod_assign: Fix the incorrect type of some input parameters
David Mudrák [Thu, 5 Jan 2017 12:20:59 +0000 (13:20 +0100)]
MDL-57580 mod_assign: Fix the incorrect type of some input parameters

The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.

4 years agoMerge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Thu, 5 Jan 2017 10:09:17 +0000 (10:09 +0000)]
Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 5 Jan 2017 06:51:54 +0000 (06:51 +0000)]
Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57531 behat: Set noreplyaddress to valid address
Rajesh Taneja [Thu, 5 Jan 2017 06:40:16 +0000 (14:40 +0800)]
MDL-57531 behat: Set noreplyaddress to valid address

noreplyaddress should be a valid address, else
it will not be saved. For behat we don't send
email, so set it to noreply@example.com, to
avoid failing validation on localhost

4 years agoMDL-57563 lang: Use the new newsitemsnumber wording in behat
David Mudrák [Wed, 4 Jan 2017 21:09:44 +0000 (22:09 +0100)]
MDL-57563 lang: Use the new newsitemsnumber wording in behat

4 years agoMDL-57563 lang: Merge English strings from the en_fix language pack
Helen Foster [Wed, 4 Jan 2017 21:03:08 +0000 (22:03 +0100)]
MDL-57563 lang: Merge English strings from the en_fix language pack

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 4 Jan 2017 16:04:57 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 4 Jan 2017 13:29:10 +0000 (13:29 +0000)]
Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle

4 years agoMDL-57531 mail: Make validate_email return actual boolean as expected
David Mudrák [Wed, 4 Jan 2017 12:13:31 +0000 (13:13 +0100)]
MDL-57531 mail: Make validate_email return actual boolean as expected

It was discovered by unit tests that the return value is not a real
boolean as was intuitively expected and documented. To avoid potential
issues with the truthyness in the future, we explicitly cast the return
value to boolean now.

4 years agoMDL-57531 mail: Validate the sender's email address
David Mudrák [Tue, 3 Jan 2017 21:09:30 +0000 (22:09 +0100)]
MDL-57531 mail: Validate the sender's email address

The patch adds validation for the noreplyaddress setting variable, for
the explicit $replyto parameter and for the sender's email. In case of
misconfigured noreplyaddress setting, it falls back to the default
noreply address value. In case of invalid email in the user's record,
the email is not sent.

The patch also adds unit test for the value returned by the function
generate_email_processing_address() so that it can be considered as a
valid email, too.

This is supposed to significantly minimise the risk of exploiting the
vulnerability in PHPMailer's Sender field.

4 years agoMDL-57531 mail: Do not let admins set invalid email addresses
David Mudrák [Tue, 3 Jan 2017 21:15:43 +0000 (22:15 +0100)]
MDL-57531 mail: Do not let admins set invalid email addresses

The noreply and support emails should always be valid.

4 years agoMerge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 4 Jan 2017 10:58:46 +0000 (11:58 +0100)]
Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle

4 years agoMDL-56225 mod_forum: Fix inability to edit attachments
David Mudrák [Wed, 4 Jan 2017 09:58:44 +0000 (10:58 +0100)]
MDL-56225 mod_forum: Fix inability to edit attachments

The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.

There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.

4 years agoMerge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
David Monllao [Wed, 4 Jan 2017 05:02:44 +0000 (06:02 +0100)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle

4 years agoMDL-57338 templates: Fix modal_cancel template name
David Monllao [Wed, 4 Jan 2017 04:47:58 +0000 (05:47 +0100)]
MDL-57338 templates: Fix modal_cancel template name

4 years agoMDL-57536 availability: Fixed css for clean theme
Rajesh Taneja [Wed, 4 Jan 2017 00:59:40 +0000 (08:59 +0800)]
MDL-57536 availability: Fixed css for clean theme

4 years agoMerge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 3 Jan 2017 18:07:12 +0000 (18:07 +0000)]
Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle

4 years agoMDL-56992 core_scss: Don't allow invalid files to be included
Ankit Agarwal [Thu, 8 Dec 2016 06:03:55 +0000 (11:33 +0530)]
MDL-56992 core_scss: Don't allow invalid files to be included

We allow only .scss files so allow files to be included only and only if they end in .scss and they exist on server under theme directory.

4 years agoMDL-56225 mod_forum: Remove unnecessary attributes from update
Andrew Nicols [Fri, 7 Oct 2016 02:56:29 +0000 (10:56 +0800)]
MDL-56225 mod_forum: Remove unnecessary attributes from update

4 years agoMDL-49557 mod_scorm: optionally strip quotes.
Dan Marsden [Wed, 4 Jan 2017 02:43:46 +0000 (15:43 +1300)]
MDL-49557 mod_scorm: optionally strip quotes.

4 years agoMDL-57192 dml: Temporarily disable query logging during setup
Ankit Agarwal [Wed, 21 Dec 2016 08:24:56 +0000 (13:54 +0530)]
MDL-57192 dml: Temporarily disable query logging during setup

4 years agoMDL-57192 dml: Support temporarily disabling query logs during setup
Ankit Agarwal [Wed, 21 Dec 2016 08:24:22 +0000 (13:54 +0530)]
MDL-57192 dml: Support temporarily disabling query logs during setup

4 years agoMerge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 3 Jan 2017 08:16:22 +0000 (08:16 +0000)]
Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-52168 behat: Select iframe in which text needs to be checked
Rajesh Taneja [Tue, 3 Jan 2017 07:14:04 +0000 (15:14 +0800)]
MDL-52168 behat: Select iframe in which text needs to be checked

4 years agoMerge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2017 01:34:58 +0000 (02:34 +0100)]
Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle

4 years agoMerge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)]
Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57536-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 17:59:16 +0000 (18:59 +0100)]
Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle

4 years agoMDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS
Juan Leyva [Mon, 26 Dec 2016 17:06:15 +0000 (18:06 +0100)]
MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS

4 years agoMDL-57536 availability: Document required selectors changes
Juan Leyva [Wed, 28 Dec 2016 10:58:46 +0000 (11:58 +0100)]
MDL-57536 availability: Document required selectors changes

MDL-55839 Introduced some changes in CSS selectors used by the form.js
file.

This caused contributed plugins to not work (javascript stop working)
when editing a module.

4 years agoMerge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 15:42:41 +0000 (16:42 +0100)]
Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle

4 years agoMerge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:35:11 +0000 (12:35 +0000)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle

4 years agoMerge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)]
Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle

4 years agoMerge branch 'MDL-57080-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:15:01 +0000 (12:15 +0000)]
Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle

4 years agoMerge branch 'MDL-57395-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:46:44 +0000 (11:46 +0000)]
Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)]
Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle

4 years agoMDL-57532 calendar: tidy up button grouping
Dan Poltawski [Mon, 2 Jan 2017 10:44:35 +0000 (10:44 +0000)]
MDL-57532 calendar: tidy up button grouping

4 years agoMerge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)]
Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle

4 years agoMerge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle
David Monllao [Fri, 30 Dec 2016 08:59:45 +0000 (09:59 +0100)]
Merge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle

4 years agoMDL-56926 theme_boost: Restore filepicker's filename and icons original spacing
David Monllao [Thu, 29 Dec 2016 07:38:43 +0000 (08:38 +0100)]
MDL-56926 theme_boost: Restore filepicker's filename and icons original spacing

4 years agoMDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides
Nadav Kavalerchik [Wed, 28 Dec 2016 22:08:54 +0000 (00:08 +0200)]
MDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides

4 years agoAutomatically generated installer lang files
AMOS bot [Thu, 29 Dec 2016 16:05:07 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)]
Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle

4 years agoMerge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 29 Dec 2016 11:46:47 +0000 (11:46 +0000)]
Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle

4 years agoMDL-57512 categories: Use maxcategorydepth only when getting all cats
Pau Ferrer Ocaña [Thu, 22 Dec 2016 11:59:55 +0000 (12:59 +0100)]
MDL-57512 categories: Use maxcategorydepth only when getting all cats

4 years agoMerge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 09:44:01 +0000 (10:44 +0100)]
Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle

4 years agoMDL-57338 templates: fix missing example variables
Dan Poltawski [Thu, 29 Dec 2016 08:03:47 +0000 (08:03 +0000)]
MDL-57338 templates: fix missing example variables

From Davids review, thanks

4 years agoMDL-57471 forms: Removing unresolved conflict line
David Monllao [Thu, 29 Dec 2016 07:54:36 +0000 (08:54 +0100)]
MDL-57471 forms: Removing unresolved conflict line

4 years agoMerge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 07:43:37 +0000 (08:43 +0100)]
Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57331-master' of https://github.com/xow/moodle
David Monllao [Wed, 28 Dec 2016 21:07:12 +0000 (22:07 +0100)]
Merge branch 'MDL-57331-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:20:04 +0000 (15:20 +0000)]
Merge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle

4 years agoMerge branch 'MDL-55955_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:11:56 +0000 (15:11 +0000)]
Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:06:03 +0000 (15:06 +0000)]
Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle
David Monllao [Wed, 28 Dec 2016 12:53:19 +0000 (13:53 +0100)]
Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle

4 years agoMerge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 12:37:19 +0000 (13:37 +0100)]
Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57417-master' of https://github.com/snake/moodle
Dan Poltawski [Wed, 28 Dec 2016 12:17:15 +0000 (12:17 +0000)]
Merge branch 'MDL-57417-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 28 Dec 2016 11:22:52 +0000 (12:22 +0100)]
Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 10:45:34 +0000 (11:45 +0100)]
Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 10:30:51 +0000 (10:30 +0000)]
Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle

4 years agoMDL-57395 course: New Web Service core_course_get_updates_since
Juan Leyva [Wed, 28 Dec 2016 10:24:40 +0000 (11:24 +0100)]
MDL-57395 course: New Web Service core_course_get_updates_since

4 years agoMerge branch 'MDL-57357-master' of https://github.com/snake/moodle
David Monllao [Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)]
Merge branch 'MDL-57357-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 09:58:13 +0000 (10:58 +0100)]
Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 09:13:29 +0000 (09:13 +0000)]
Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle

4 years agoMerge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 28 Dec 2016 08:56:12 +0000 (08:56 +0000)]
Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle

4 years agoMDL-52168 mod_scorm: Fix issue when scorm does not define org.
Dan Marsden [Mon, 16 Nov 2015 16:54:45 +0000 (16:54 +0000)]
MDL-52168 mod_scorm: Fix issue when scorm does not define org.

4 years agoMDL-57532 calendar: Add missing bootstrap classes
Stephen Bourget [Mon, 26 Dec 2016 16:33:35 +0000 (11:33 -0500)]
MDL-57532 calendar: Add missing bootstrap classes

4 years agoAutomatically generated installer lang files
AMOS bot [Mon, 26 Dec 2016 16:08:47 +0000 (00:08 +0800)]
Automatically generated installer lang files

4 years agoAutomatically generated installer lang files
AMOS bot [Sun, 25 Dec 2016 16:05:40 +0000 (00:05 +0800)]
Automatically generated installer lang files

4 years agoAutomatically generated installer lang files
AMOS bot [Sat, 24 Dec 2016 16:04:27 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMDL-56488 boost: validate scss settings for parsable scss
Dan Poltawski [Wed, 14 Dec 2016 10:47:33 +0000 (10:47 +0000)]
MDL-56488 boost: validate scss settings for parsable scss

* Parses the scss and fails validation if a parse error is found

* Does not detect the situation when variables are not present - this
  would involve us parsing the entire tree and would be slow. It could
  also change over time, depending on whats defined in the scss
  from themes.

* Introduces a new admin_setting_scsscode to do this

4 years agoMDL-57464 mod_lesson: fix notice with sub-clusters.
Adrian Greeve [Tue, 20 Dec 2016 06:39:54 +0000 (14:39 +0800)]
MDL-57464 mod_lesson: fix notice with sub-clusters.

4 years agoMDL-57357 auth: add behat coverage for remember username login feature
Jake Dallimore [Fri, 23 Dec 2016 02:42:16 +0000 (10:42 +0800)]
MDL-57357 auth: add behat coverage for remember username login feature

4 years agoMDL-57357 auth: fix the remember username feature on login page
Jake Dallimore [Fri, 23 Dec 2016 02:42:01 +0000 (10:42 +0800)]
MDL-57357 auth: fix the remember username feature on login page

4 years agoMDL-57417 navigation: fix legacy_activity_onclick_handler callback scope
Jake Dallimore [Fri, 16 Dec 2016 04:01:46 +0000 (12:01 +0800)]
MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope

4 years agoMDL-49557 mod_scorm: fix AICC pre-requisite handling.
Dan Marsden [Thu, 22 Dec 2016 23:04:41 +0000 (12:04 +1300)]
MDL-49557 mod_scorm: fix AICC pre-requisite handling.

4 years agoMDL-50643 mod_scorm: redirect using current window instead of parent.
Dan Marsden [Tue, 20 Dec 2016 07:28:39 +0000 (20:28 +1300)]
MDL-50643 mod_scorm: redirect using current window instead of parent.

4 years agoMDL-57491 report_log: Improve filtering code by using static entries
Stephen Bourget [Thu, 22 Dec 2016 21:11:36 +0000 (16:11 -0500)]
MDL-57491 report_log: Improve filtering code by using static entries

4 years agoMDL-57338 message: fix template component
Dan Poltawski [Thu, 22 Dec 2016 12:30:53 +0000 (12:30 +0000)]
MDL-57338 message: fix template component

4 years agoMDL-57338 templates: add missing example context
Dan Poltawski [Fri, 9 Dec 2016 12:17:39 +0000 (12:17 +0000)]
MDL-57338 templates: add missing example context

4 years agoMDL-57338 chart: add example context
Dan Poltawski [Fri, 9 Dec 2016 12:17:31 +0000 (12:17 +0000)]
MDL-57338 chart: add example context

And fix aria roles

4 years agoMDL-57338 mustache: fix admin_setting_tabs
Dan Poltawski [Thu, 8 Dec 2016 15:53:54 +0000 (15:53 +0000)]
MDL-57338 mustache: fix admin_setting_tabs

* Add example context
* Fix validation issue (need role="tablist" to contain the tabs)

4 years agoMDL-57472 javascript-static: remove fix_column_widths()
Dan Poltawski [Tue, 20 Dec 2016 15:57:26 +0000 (15:57 +0000)]
MDL-57472 javascript-static: remove fix_column_widths()

A bit of a hack applied nearly 12 years ago in
7979105c629050e744b9e889a95b6984cf912b03

4 years agoMDL-57471 forms: deprecate init_javascript_enhancement()
Dan Poltawski [Tue, 20 Dec 2016 15:06:05 +0000 (15:06 +0000)]
MDL-57471 forms: deprecate init_javascript_enhancement()

This was half-finished and only used for the smartselect enhancement. That
enhancement doesn't work with theme_boost and is better replaced just
using the searchableselector element.

4 years agoMDL-57080 completion: Update completion expected date on reset
Michael Aherne [Thu, 24 Nov 2016 09:05:05 +0000 (09:05 +0000)]
MDL-57080 completion: Update completion expected date on reset

4 years agoMDL-57451 theme_boost: Add checkboxgroup class to checkbox input element
Tony Butler [Mon, 19 Dec 2016 12:02:45 +0000 (12:02 +0000)]
MDL-57451 theme_boost: Add checkboxgroup class to checkbox input element

4 years agoweekly release 3.3dev
Dan Poltawski [Thu, 22 Dec 2016 08:15:04 +0000 (08:15 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 22 Dec 2016 08:15:02 +0000 (08:15 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-57292 tool_lpimportcsv: Fix for unit tests.
Adrian Greeve [Thu, 22 Dec 2016 05:06:40 +0000 (13:06 +0800)]
MDL-57292 tool_lpimportcsv: Fix for unit tests.

4 years agoMDL-57494 behat: Fixed tags and removed reset in after_scenario
Rajesh Taneja [Thu, 22 Dec 2016 04:42:39 +0000 (12:42 +0800)]
MDL-57494 behat: Fixed tags and removed reset in after_scenario

1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.

4 years agoMDL-55955 mod_quiz: ensure duplicated override events are removed
Mark Nelson [Thu, 22 Dec 2016 04:41:32 +0000 (12:41 +0800)]
MDL-55955 mod_quiz: ensure duplicated override events are removed

4 years agoMerge branch 'MDL-57187-master-htmlaudiofix' of git://github.com/snake/moodle
David Monllao [Wed, 21 Dec 2016 07:02:21 +0000 (08:02 +0100)]
Merge branch 'MDL-57187-master-htmlaudiofix' of git://github.com/snake/moodle

4 years agoMDL-57187 filter_mediaplugin: fix audio tag height in chrome
Jake Dallimore [Wed, 21 Dec 2016 05:46:42 +0000 (13:46 +0800)]
MDL-57187 filter_mediaplugin: fix audio tag height in chrome

Chrome's html5 audio tags don't have a height and 'auto' renders them
with zero height, so added a min height to address this.

4 years agoMDL-56581 behat: Use proper steps to navigate to Permissions
Rajesh Taneja [Wed, 21 Dec 2016 04:51:17 +0000 (12:51 +0800)]
MDL-56581 behat: Use proper steps to navigate to Permissions

4 years agoMDL-57474 mailer: Make sure that our exlicit MessageID is trimmed
David Mudrák [Wed, 21 Dec 2016 00:11:32 +0000 (01:11 +0100)]
MDL-57474 mailer: Make sure that our exlicit MessageID is trimmed

The new version of phpmailer shipped with Moodle 3.2 has added check
that the explicitly provided MessageID matches /^<.*@.*>$/.

Values coming from our overridden moodle_phpmailer::addCustomHeader()
had a whitespace at the start. So the requested value was not used as
the Message-ID header and the default phpmailer value was used.

As a result, forum posts threading was broken in email clients.

4 years agoMDL-53814 behat: Use table step to check for string
Rajesh Taneja [Tue, 20 Dec 2016 23:35:07 +0000 (07:35 +0800)]
MDL-53814 behat: Use table step to check for string

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 20 Dec 2016 16:03:51 +0000 (00:03 +0800)]
Automatically generated installer lang files

4 years agoMDL-44172 lib: remove example htaccess file
Dan Poltawski [Tue, 20 Dec 2016 14:33:27 +0000 (14:33 +0000)]
MDL-44172 lib: remove example htaccess file

This is not being maintained and is outdated. Better handled in docs.

4 years agoMDL-56581 boost: add styling for overriden permission highlight
Dan Poltawski [Tue, 20 Dec 2016 12:10:08 +0000 (12:10 +0000)]
MDL-56581 boost: add styling for overriden permission highlight

4 years agoMDL-56581 Roles: Permissions override screen not inherited styling
Jes Ackland-Snow [Thu, 20 Oct 2016 15:52:33 +0000 (17:52 +0200)]
MDL-56581 Roles: Permissions override screen not inherited styling