moodle.git
5 years agoMDL-54844 mod_glossary: Limiting of glossary searching.
Adrian Greeve [Thu, 9 Jun 2016 05:58:59 +0000 (13:58 +0800)]
MDL-54844 mod_glossary: Limiting of glossary searching.

Searching of the glossary was returning results from all
glossaries on the site. It has now been returned to just
the glossary that you are currently viewing.

5 years agoMerge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 6 Jul 2016 01:19:08 +0000 (03:19 +0200)]
Merge branch 'wip-mdl-55043' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-55043 core_competency: Set proper sort order for each field
Rajesh Taneja [Mon, 4 Jul 2016 05:01:17 +0000 (13:01 +0800)]
MDL-55043 core_competency: Set proper sort order for each field

5 years agoMerge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)]
Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-54860 behat: Stop execution if setup problem found
Rajesh Taneja [Wed, 29 Jun 2016 05:34:11 +0000 (13:34 +0800)]
MDL-54860 behat: Stop execution if setup problem found

5 years agoMDL-54951 webservice: Add upgrade notes for external_files
Andrew Nicols [Tue, 5 Jul 2016 23:21:32 +0000 (07:21 +0800)]
MDL-54951 webservice: Add upgrade notes for external_files

5 years agoMerge branch 'MDL-54857-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 22:03:39 +0000 (00:03 +0200)]
Merge branch 'MDL-54857-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54856-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:18:41 +0000 (21:18 +0200)]
Merge branch 'MDL-54856-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54955-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:15:31 +0000 (21:15 +0200)]
Merge branch 'MDL-54955-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54800-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)]
Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54602-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:59:52 +0000 (20:59 +0200)]
Merge branch 'MDL-54602-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:44:14 +0000 (20:44 +0200)]
Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle

5 years agoMerge branch 'MDL-54867-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:25:54 +0000 (20:25 +0200)]
Merge branch 'MDL-54867-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-49244-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:16:44 +0000 (20:16 +0200)]
Merge branch 'MDL-49244-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54795_master' of https://github.com/snake/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)]
Merge branch 'MDL-54795_master' of https://github.com/snake/moodle

5 years agoMDL-55000 grade: Use correct component names + minor jsdocs
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 17:59:24 +0000 (19:59 +0200)]
MDL-55000 grade: Use correct component names + minor jsdocs

Note the js_call_amd() call still is using incorrect 'grades'
as component name where it should be core_grades. That will be
fixed by MDL-55133.

5 years agoMerge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)]
Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'MDL-29738-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-55000 grade: Convert remaining YUI2 -> AMD
Andrew Nicols [Thu, 23 Jun 2016 05:04:17 +0000 (13:04 +0800)]
MDL-55000 grade: Convert remaining YUI2 -> AMD

5 years agoMDL-29738 file: Remove unused stylesheet functionality
Andrew Nicols [Mon, 4 Jul 2016 07:25:28 +0000 (15:25 +0800)]
MDL-29738 file: Remove unused stylesheet functionality

This functionality was commented out in
78946b9bdb1299a21f00b88d81c73ad8700c951e for MDL-20204 back in 2009.
Since then it has been wasting cycles performing utterly pointless
preg_match and preg_replace calls.

The decision has been made to deprecate it in stables, and remove it in
3.2.

5 years agoMerge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)]
Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-55113-master' of git://github.com/dpalou/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 10:21:46 +0000 (12:21 +0200)]
Merge branch 'MDL-55113-master' of git://github.com/dpalou/moodle

5 years agoMerge branch 'MDL-54928-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 5 Jul 2016 10:20:07 +0000 (11:20 +0100)]
Merge branch 'MDL-54928-master' of git://github.com/dpalou/moodle

5 years agoMerge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle
Dan Poltawski [Tue, 5 Jul 2016 10:06:38 +0000 (11:06 +0100)]
Merge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle

5 years agoMDL-54928 notifications: Add username to emailto users
Dani Palou [Tue, 5 Jul 2016 08:34:52 +0000 (10:34 +0200)]
MDL-54928 notifications: Add username to emailto users

5 years agoMerge branch 'MDL-53495' of https://github.com/mr-russ/moodle
Andrew Nicols [Tue, 5 Jul 2016 07:07:21 +0000 (15:07 +0800)]
Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle

5 years agoMDL-54841 workshop: Combine links for attachment icon and text.
An Pham Van [Tue, 21 Jun 2016 09:49:14 +0000 (16:49 +0700)]
MDL-54841 workshop: Combine links for attachment icon and text.

In a workshop activity, on the view submission page where having attachment(s), there's an accessibility issue.
There're 2 separate links for the icon and text which causes an issue for keyboard and screen reader users.
So the text and icon should be combined in one link.

5 years agoMerge branch 'MDL-55001-home-noredirect' of https://github.com/brendanheywood/moodle
Andrew Nicols [Tue, 5 Jul 2016 06:15:36 +0000 (14:15 +0800)]
Merge branch 'MDL-55001-home-noredirect' of https://github.com/brendanheywood/moodle

5 years agoMDL-53431 tool_monitor: Access control for tool monitor subscriptions
Jake Dallimore [Wed, 25 May 2016 06:50:29 +0000 (14:50 +0800)]
MDL-53431 tool_monitor: Access control for tool monitor subscriptions

5 years agoMerge branch 'MDL-54951-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 5 Jul 2016 01:41:31 +0000 (09:41 +0800)]
Merge branch 'MDL-54951-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54889-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 5 Jul 2016 01:27:17 +0000 (09:27 +0800)]
Merge branch 'MDL-54889-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-53019' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 5 Jul 2016 00:48:54 +0000 (08:48 +0800)]
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle

5 years agoMDL-53019 travis: Don't run 5.6 mysql unit tests and minor cleanup
Eloy Lafuente (stronk7) [Tue, 5 Jul 2016 00:35:26 +0000 (02:35 +0200)]
MDL-53019 travis: Don't run 5.6 mysql unit tests and minor cleanup

5 years agoMerge branch 'MDL-53019' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 5 Jul 2016 00:15:02 +0000 (08:15 +0800)]
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle

5 years agoMDL-53019 php: bump all harcoded versions to new 5.6.5 requirement
Eloy Lafuente (stronk7) [Mon, 4 Jul 2016 23:50:43 +0000 (01:50 +0200)]
MDL-53019 php: bump all harcoded versions to new 5.6.5 requirement

Moodle 3.2 and up will require PHP >= 5.6.5. Hopefully some day we'll
have this centralized with MDL-39007, just it's not done yet.

Thanks to Stephen Bourget for raising this!

5 years agoMDL-50758 behat: Fixed string changes
Rajesh Taneja [Mon, 4 Jul 2016 23:38:54 +0000 (07:38 +0800)]
MDL-50758 behat: Fixed string changes

5 years agoMerge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jul 2016 22:19:59 +0000 (00:19 +0200)]
Merge branch 'wip-MDL-37946-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)]
Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-55019-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)]
Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:51:59 +0000 (14:51 +0100)]
Merge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle

5 years agoMDL-55019 webservice: Course summary text should not be cleaned
Juan Leyva [Fri, 24 Jun 2016 12:33:42 +0000 (13:33 +0100)]
MDL-55019 webservice: Course summary text should not be cleaned

5 years agoMerge branch 'MDL-54994' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)]
Merge branch 'MDL-54994' of git://github.com/stronk7/moodle

5 years agoMDL-54980 mod_assign: bump version
Dan Poltawski [Mon, 4 Jul 2016 13:10:24 +0000 (14:10 +0100)]
MDL-54980 mod_assign: bump version

5 years agoMerge branch 'MDL-54980-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:09:43 +0000 (14:09 +0100)]
Merge branch 'MDL-54980-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50758' of https://github.com/creator23/moodle
Dan Poltawski [Mon, 4 Jul 2016 13:08:39 +0000 (14:08 +0100)]
Merge branch 'MDL-50758' of https://github.com/creator23/moodle

5 years agoMerge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)]
Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle
Dan Poltawski [Mon, 4 Jul 2016 11:45:55 +0000 (12:45 +0100)]
Merge branch 'MDL-55041_master' of https://github.com/marxjohnson/moodle

5 years agoMerge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 4 Jul 2016 11:39:35 +0000 (12:39 +0100)]
Merge branch 'MDL-41945-master' of git://github.com/cameron1729/moodle

5 years agoMDL-55069 core: escape special characters in email headers
Marina Glancy [Mon, 4 Jul 2016 02:32:20 +0000 (10:32 +0800)]
MDL-55069 core: escape special characters in email headers

5 years agoMerge branch 'MDL-54794_master' of https://github.com/dg711/moodle
Dan Poltawski [Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)]
Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle

5 years agoMDL-54951 webservice: Return intro text files in modules
Juan Leyva [Tue, 21 Jun 2016 09:53:45 +0000 (10:53 +0100)]
MDL-54951 webservice: Return intro text files in modules

5 years agoMDL-54951 webservice: Utility methods for generating a list of files
Juan Leyva [Tue, 21 Jun 2016 08:30:55 +0000 (09:30 +0100)]
MDL-54951 webservice: Utility methods for generating a list of files

It includes a new external_files structure and a get_area_files method
in external_util

5 years agoMDL-55113 assign: Use PARAM_RAW in onlinetext text
Dani Palou [Mon, 4 Jul 2016 07:29:29 +0000 (09:29 +0200)]
MDL-55113 assign: Use PARAM_RAW in onlinetext text

5 years agoMDL-55114 chat: Remove commented-out variables
Andrew Nicols [Mon, 4 Jul 2016 07:19:48 +0000 (15:19 +0800)]
MDL-55114 chat: Remove commented-out variables

5 years agoMerge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 4 Jul 2016 07:11:14 +0000 (15:11 +0800)]
Merge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-55049-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)]
Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Mon, 4 Jul 2016 06:04:23 +0000 (14:04 +0800)]
Merge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:59:09 +0000 (12:59 +0800)]
Merge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle

5 years agoMerge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:18:34 +0000 (12:18 +0800)]
Merge branch 'wip-mdl-48114' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-55050-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Mon, 4 Jul 2016 04:16:31 +0000 (12:16 +0800)]
Merge branch 'MDL-55050-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 4 Jul 2016 03:52:05 +0000 (11:52 +0800)]
Merge branch 'MDL-54877-master-clean-on-output' of git://github.com/junpataleta/moodle

5 years agoMDL-41945 mod_assign: Properly check if submission is empty
Cameron Ball [Tue, 31 May 2016 06:20:03 +0000 (14:20 +0800)]
MDL-41945 mod_assign: Properly check if submission is empty

Previous empty submission checks required the submission to
be saved to the database. This patch adds a new method to
submission plugins that lets them report whether the submission
is empty before it is saved.

5 years agoMerge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 4 Jul 2016 02:54:59 +0000 (10:54 +0800)]
Merge branch 'MDL-55020-master-pluginzip' of git://github.com/mudrd8mz/moodle

5 years agoMDL-41945 mod_assign: Check if submission has been modified
Cameron Ball [Tue, 31 May 2016 05:42:31 +0000 (13:42 +0800)]
MDL-41945 mod_assign: Check if submission has been modified

This patch adds a check that stops a user submitting an assignment
if someone else has modified it in the meantime.

5 years agoMerge branch 'MDL-54968-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 4 Jul 2016 02:21:06 +0000 (10:21 +0800)]
Merge branch 'MDL-54968-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-53019' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 4 Jul 2016 01:07:39 +0000 (09:07 +0800)]
Merge branch 'MDL-53019' of git://github.com/stronk7/moodle

5 years agoMerge branch 'MDL-54947' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Sun, 3 Jul 2016 23:05:12 +0000 (01:05 +0200)]
Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle

5 years agoMDL-48944 mod_survey: Add activity completion on submission
Stephen Bourget [Sun, 3 Jul 2016 19:34:11 +0000 (15:34 -0400)]
MDL-48944 mod_survey: Add activity completion on submission

5 years agoMDL-54794 user: added Users to globalsearch
Devang Gaur [Wed, 29 Jun 2016 19:20:53 +0000 (00:50 +0530)]
MDL-54794 user: added Users to globalsearch

5 years agoMDL-55041 roles: Fix JSON parsing in permission manager
Mark Johnson [Tue, 28 Jun 2016 11:38:41 +0000 (12:38 +0100)]
MDL-55041 roles: Fix JSON parsing in permission manager

5 years agoMDL-54867 webservice: Document webservice/upload.php deprecation
Juan Leyva [Wed, 15 Jun 2016 08:33:01 +0000 (09:33 +0100)]
MDL-54867 webservice: Document webservice/upload.php deprecation

The 'private' file area is not supported anymore, only 'draft' is
supported right now.

5 years agoMDL-54934 workshop: indicate current phase
Loc Nguyen [Wed, 22 Jun 2016 04:47:28 +0000 (11:47 +0700)]
MDL-54934 workshop: indicate current phase

Indicate phase in page titles, current phase in userplan table
so that it's accessible to me through my screen reader

5 years agoMDL-53019 travis: adjust runs to use PHP 5.6
Eloy Lafuente (stronk7) [Fri, 1 Jul 2016 11:58:18 +0000 (13:58 +0200)]
MDL-53019 travis: adjust runs to use PHP 5.6

5 years agoMDL-53019 environment: 3.2 requirements added
Eloy Lafuente (stronk7) [Fri, 1 Jul 2016 11:44:36 +0000 (13:44 +0200)]
MDL-53019 environment: 3.2 requirements added

Changes:
 - PHP 5.6.5 required

5 years agoMDL-54994 badges: Count correctly the number of external badges shown
Eloy Lafuente (stronk7) [Wed, 22 Jun 2016 16:26:13 +0000 (18:26 +0200)]
MDL-54994 badges: Count correctly the number of external badges shown

5 years agoMDL-54976 mod_scorm: Add validation for availability dates
Jun Pataleta [Tue, 21 Jun 2016 07:45:55 +0000 (15:45 +0800)]
MDL-54976 mod_scorm: Add validation for availability dates

5 years agoMDL-54795 mod_assign: Fix notifications JS error in grading interface
Jake Dallimore [Tue, 28 Jun 2016 02:26:47 +0000 (10:26 +0800)]
MDL-54795 mod_assign: Fix notifications JS error in grading interface

5 years agoMDL-54928 notifications: Retrieve username from DB if empty
Dani Palou [Thu, 16 Jun 2016 07:37:03 +0000 (09:37 +0200)]
MDL-54928 notifications: Retrieve username from DB if empty

5 years agoMDL-55032 tool_lp: check access when showing link to competencies
Marina Glancy [Tue, 28 Jun 2016 04:10:38 +0000 (12:10 +0800)]
MDL-55032 tool_lp: check access when showing link to competencies

Also if course competencies page is accessed without capabilities do
redirect before starting output.

5 years agoweekly release 3.2dev
Andrew Nicols [Fri, 1 Jul 2016 02:20:17 +0000 (10:20 +0800)]
weekly release 3.2dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Fri, 1 Jul 2016 02:20:11 +0000 (10:20 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-55020 admin: Fix renaming of the plugin package root folder
David Mudrák [Thu, 30 Jun 2016 22:18:10 +0000 (00:18 +0200)]
MDL-55020 admin: Fix renaming of the plugin package root folder

There was a problem with core\update\code_manager::unzip_plugin_file()
if it was used to extract a plugin package into a non-empty target
directory and the plugin package root folder was being renamed at the
same time.

The problem was caused by the underlying helper method
rename_extracted_rootdir() that worked only for ZIPs extracted to an
empty temporary location. When the plugin was extracted to the actual
dirroot with other existing plugin folders present, the method failed
badly.

The solution in the patch is to always extract the ZIP into a temporary
empty location, perform the eventual root renaming there, and only then
move the extracted contents to the final destination. Additionally we
are changing the behaviour of the rename_extracted_rootdir() method so
that now it throws exception if the plugin package contains multiple
root folders (it should not happen in normal situations as such a plugin
would not pass the pre-install validation).

Unit tests did not catch this bug before because in the tests, the
target directory had been empty. Now we are adding a new directory
"aaa_another" to the target location to test in more realistic
environment. Tests for the new behaviour of the renaming method are
added, too.

p.s. I noticed that moodle_exception class was not imported into the
namespace and this is fixed now too (and covered with unit tests).

5 years agoMDL-50758 qtype_multichoice: Displays multiple correct answers
Anant [Fri, 24 Jun 2016 21:19:29 +0000 (14:19 -0700)]
MDL-50758 qtype_multichoice: Displays multiple correct answers

5 years agoMDL-49244 course: Clean parameters in core_course_get_categories
Juan Leyva [Mon, 27 Jun 2016 10:18:30 +0000 (11:18 +0100)]
MDL-49244 course: Clean parameters in core_course_get_categories

5 years agoMDL-32135 mod_choice: fix behat tests
Dan Poltawski [Wed, 29 Jun 2016 16:49:16 +0000 (17:49 +0100)]
MDL-32135 mod_choice: fix behat tests

5 years agoMDL-32135 mod_choice: update behat tests
Stephen Bourget [Wed, 29 Jun 2016 15:19:10 +0000 (11:19 -0400)]
MDL-32135 mod_choice: update behat tests

5 years agoMerge branch 'MDL-54610_master' of https://github.com/snake/moodle
Andrew Nicols [Wed, 29 Jun 2016 01:23:48 +0000 (09:23 +0800)]
Merge branch 'MDL-54610_master' of https://github.com/snake/moodle

5 years agoMerge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jun 2016 17:12:02 +0000 (19:12 +0200)]
Merge branch 'wip-MDL-47113-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-54855-master' of git://github.com/crazyserver/moodle
Eloy Lafuente (stronk7) [Tue, 28 Jun 2016 14:33:11 +0000 (16:33 +0200)]
Merge branch 'MDL-54855-master' of git://github.com/crazyserver/moodle

5 years agoMerge branch 'MDL-54104-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 28 Jun 2016 13:31:45 +0000 (14:31 +0100)]
Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 28 Jun 2016 10:27:35 +0000 (11:27 +0100)]
Merge branch 'MDL-55022-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-55027_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 28 Jun 2016 09:56:11 +0000 (10:56 +0100)]
Merge branch 'MDL-55027_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-54993' of https://github.com/sk-unikent/moodle
Dan Poltawski [Tue, 28 Jun 2016 09:18:11 +0000 (10:18 +0100)]
Merge branch 'MDL-54993' of https://github.com/sk-unikent/moodle

5 years agoMerge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 28 Jun 2016 09:07:43 +0000 (10:07 +0100)]
Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-54865-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Tue, 28 Jun 2016 08:36:52 +0000 (09:36 +0100)]
Merge branch 'MDL-54865-master' of git://github.com/ryanwyllie/moodle

5 years agoMDL-54889 jshint: stop using for everything but shifter
Dan Poltawski [Tue, 28 Jun 2016 09:41:18 +0000 (10:41 +0100)]
MDL-54889 jshint: stop using for everything but shifter

Now jshint has been replaced by eslint.

5 years agoMDL-54877 mod_lti: Clean LTI tool type name and description on output
Jun Pataleta [Thu, 30 Jun 2016 02:21:38 +0000 (10:21 +0800)]
MDL-54877 mod_lti: Clean LTI tool type name and description on output

* Use clean_param() for name and description when displaying the tool type.
    Basically in the following functions:
    - serialise_tool_type()
    - lti_get_configured_types()
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
    in tool update parameters.
* Changed name and description's type from PARAM_TEXT to PARAM_RAW
   in mod_lti_external::tool_type_return_structure()

5 years agoMDL-54947 database: Update PostgreSQL binary handling.
Russell Smith [Tue, 14 Jun 2016 03:47:36 +0000 (13:47 +1000)]
MDL-54947 database: Update PostgreSQL binary handling.

PostgreSQL 9.1 allows hex formating for binary which is handled better
by pg_query_params().

Getting bytea isn't required on connection, it can be used as pg_field_type()
when binary needs to be checked.

5 years agoMDL-55057 mod_scorm: fix handling of SCO identifiers with apostrophes
Davo Smith [Wed, 29 Jun 2016 07:44:24 +0000 (08:44 +0100)]
MDL-55057 mod_scorm: fix handling of SCO identifiers with apostrophes

5 years agoMerge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 28 Jun 2016 08:19:48 +0000 (09:19 +0100)]
Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle