moodle.git
5 years agoMerge branch 'MDL-52785-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 9 Mar 2016 07:16:48 +0000 (15:16 +0800)]
Merge branch 'MDL-52785-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

5 years agoMDL-52670 quiz: Adding function to mobile service
David Monllao [Wed, 9 Mar 2016 07:12:10 +0000 (15:12 +0800)]
MDL-52670 quiz: Adding function to mobile service

5 years agoMerge branch 'MDL-52670-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 9 Mar 2016 07:10:54 +0000 (15:10 +0800)]
Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

5 years agoMerge branch 'MDL-51324-master' of git://github.com/damyon/moodle
David Monllao [Wed, 9 Mar 2016 06:20:18 +0000 (14:20 +0800)]
Merge branch 'MDL-51324-master' of git://github.com/damyon/moodle

5 years agoMDL-53273 search: Whitespace fix
Andrew Nicols [Wed, 9 Mar 2016 05:54:52 +0000 (13:54 +0800)]
MDL-53273 search: Whitespace fix

5 years agoMerge branch 'MDL-53273-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Wed, 9 Mar 2016 06:11:17 +0000 (14:11 +0800)]
Merge branch 'MDL-53273-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)]
Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle

5 years agoMDL-53247 search: Require search to be available before running indexer script
David Monllao [Wed, 9 Mar 2016 05:37:33 +0000 (13:37 +0800)]
MDL-53247 search: Require search to be available before running indexer script

5 years agoMDL-51324 coursecat: Add to search courses unit test
Damyon Wiese [Sun, 28 Feb 2016 15:19:05 +0000 (23:19 +0800)]
MDL-51324 coursecat: Add to search courses unit test

Cover new option "requiredcapabilities".

5 years agoMDL-51324 forms: fix autocomplete element double selection bug
Damyon Wiese [Sun, 28 Feb 2016 15:04:55 +0000 (23:04 +0800)]
MDL-51324 forms: fix autocomplete element double selection bug

Incorrect types were preventing the currently selected values from
being removed from the new values returned via ajax.

Also fix a selection bug with autocomplete+ajax+singleselect.

5 years agoMDL-51324 forms: Add a new course selector
Damyon Wiese [Fri, 4 Sep 2015 06:59:04 +0000 (14:59 +0800)]
MDL-51324 forms: Add a new course selector

This is a squashed commit containing a number of changes:

This is an ajax driven course selector that has searching etc. It can select single, or multiple courses.
Make course selector accept a list of courses to exclude
courseselector - lookup coursename on setValue
Use the get_course_display_name_in_list function to generate the course names
Add a throttle to auto-complete to reduce spamming the server
Do a single query to fetch all the courses in the mform element when validation fails
Fix core course search function to return results when there are less than 2 chars in the query.
Handle setData with an empty array in new course selector

5 years agoMDL-53281 search: Properly set timeout, and don't wait for optimize
Eric Merrill [Wed, 2 Mar 2016 22:32:03 +0000 (17:32 -0500)]
MDL-53281 search: Properly set timeout, and don't wait for optimize

5 years agoMDL-53327 search: add missing pluginfo lang strings
Dan Poltawski [Thu, 3 Mar 2016 09:00:48 +0000 (17:00 +0800)]
MDL-53327 search: add missing pluginfo lang strings

AMOS BEGIN
 CPY [searchengine,admin],[type_search,plugin]
AMOS END

5 years agoMDL-49897 calendar: mktime => usergetmidnight
Andrew Nicols [Wed, 9 Mar 2016 05:18:09 +0000 (13:18 +0800)]
MDL-49897 calendar: mktime => usergetmidnight

5 years agoMDL-51571 lti: Whitespace fixes
Andrew Nicols [Wed, 9 Mar 2016 04:05:08 +0000 (12:05 +0800)]
MDL-51571 lti: Whitespace fixes

5 years agoMerge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/moodle
Andrew Nicols [Wed, 9 Mar 2016 03:11:32 +0000 (11:11 +0800)]
Merge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/moodle

5 years agoMerge branch 'MDL-53271-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Wed, 9 Mar 2016 03:05:44 +0000 (11:05 +0800)]
Merge branch 'MDL-53271-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-50032-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 9 Mar 2016 02:55:18 +0000 (10:55 +0800)]
Merge branch 'MDL-50032-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Wed, 9 Mar 2016 02:06:47 +0000 (10:06 +0800)]
Merge branch 'MDL-53325-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-53281-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Wed, 9 Mar 2016 01:25:07 +0000 (09:25 +0800)]
Merge branch 'MDL-53281-master' of git://github.com/merrill-oakland/moodle

5 years agoMerge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 9 Mar 2016 00:48:44 +0000 (08:48 +0800)]
Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Wed, 9 Mar 2016 00:35:14 +0000 (08:35 +0800)]
Merge branch 'MDL-52522-master' of git://github.com/cameron1729/moodle

5 years agoMDL-53031 mod_assign: add session check on assignment plugins management
Simey Lameze [Tue, 8 Mar 2016 08:06:16 +0000 (16:06 +0800)]
MDL-53031 mod_assign: add session check on assignment plugins management

5 years agoMDL-52433 user: Remove unnecessary capability check
Jun Pataleta [Mon, 11 Jan 2016 03:05:51 +0000 (11:05 +0800)]
MDL-52433 user: Remove unnecessary capability check

5 years agoMDL-52522 grades: Add rescale grades option for grade categories.
Cameron Ball [Tue, 8 Mar 2016 08:26:44 +0000 (16:26 +0800)]
MDL-52522 grades: Add rescale grades option for grade categories.

When a grade category is overridden, it starts to behave like a regular grade item.
Therefore we need similar behaviour to what was implemented in MDL-48634.

5 years agoMerge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 8 Mar 2016 08:13:42 +0000 (16:13 +0800)]
Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-41648 gradingforms: Remove unnecessary attr
David Monllao [Tue, 8 Mar 2016 07:31:17 +0000 (15:31 +0800)]
MDL-41648 gradingforms: Remove unnecessary attr

5 years agoMerge branch 'wip-MDL-41648' of https://github.com/dg711/moodle
David Monllao [Tue, 8 Mar 2016 07:32:17 +0000 (15:32 +0800)]
Merge branch 'wip-MDL-41648' of https://github.com/dg711/moodle

5 years agoMerge branch 'MDL-49897' of https://github.com/rushi963/moodle
Andrew Nicols [Tue, 8 Mar 2016 07:05:50 +0000 (15:05 +0800)]
Merge branch 'MDL-49897' of https://github.com/rushi963/moodle

5 years agoMerge branch 'MDL-50218-master' of https://github.com/xow/moodle
David Monllao [Tue, 8 Mar 2016 06:39:54 +0000 (14:39 +0800)]
Merge branch 'MDL-50218-master' of https://github.com/xow/moodle

5 years agoMerge branch 'MDL-53010-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 8 Mar 2016 06:34:17 +0000 (14:34 +0800)]
Merge branch 'MDL-53010-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 8 Mar 2016 06:29:24 +0000 (14:29 +0800)]
Merge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-52984' of https://github.com/rushi963/moodle
David Monllao [Tue, 8 Mar 2016 06:04:07 +0000 (14:04 +0800)]
Merge branch 'MDL-52984' of https://github.com/rushi963/moodle

5 years agoMerge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle
David Monllao [Tue, 8 Mar 2016 05:57:30 +0000 (13:57 +0800)]
Merge branch 'MDL-52718-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-53047-login-anchor' of https://github.com/brendanheywood/moodle
Andrew Nicols [Tue, 8 Mar 2016 05:15:00 +0000 (13:15 +0800)]
Merge branch 'MDL-53047-login-anchor' of https://github.com/brendanheywood/moodle

5 years agoMDL-52718 block_community: Send XML-RPC request correctly
Cameron Ball [Tue, 1 Mar 2016 05:46:55 +0000 (13:46 +0800)]
MDL-52718 block_community: Send XML-RPC request correctly

mnet has its own separate XML-RPC implementation which supports
introspection. So even though we were sending incorrectly formatted
parameters, our previous XML-RPC implementation could work out how
to mangle the parameters to be correct. Introspection is not a
part of the XML-RPC specification and we should not rely on it. Our
current XML-RPC client/server implementation does not support it either.

Therefore we should always send data in the expected format.

5 years agoMDL-51167 tool_monitor: check course visibility and user capabilities
Simey Lameze [Mon, 29 Feb 2016 05:39:39 +0000 (13:39 +0800)]
MDL-51167 tool_monitor: check course visibility and user capabilities

5 years agoMerge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 8 Mar 2016 01:21:47 +0000 (09:21 +0800)]
Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-53247-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 8 Mar 2016 01:17:13 +0000 (09:17 +0800)]
Merge branch 'MDL-53247-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-52651 htmlpurifier: Append rel=noreferrer to links.
Cameron Ball [Thu, 11 Feb 2016 03:25:53 +0000 (11:25 +0800)]
MDL-52651 htmlpurifier: Append rel=noreferrer to links.

Thank you to Zachary Durber for originally working on this issue.

5 years agoMerge branch 'MDL-53350' of git://github.com/timhunt/moodle
David Monllao [Tue, 8 Mar 2016 01:04:01 +0000 (09:04 +0800)]
Merge branch 'MDL-53350' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-53353' of git://github.com/timhunt/moodle
David Monllao [Tue, 8 Mar 2016 00:44:28 +0000 (08:44 +0800)]
Merge branch 'MDL-53353' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-53291_ajax_fix' of https://github.com/BenKelada/moodle
Andrew Nicols [Mon, 7 Mar 2016 23:43:31 +0000 (07:43 +0800)]
Merge branch 'MDL-53291_ajax_fix' of https://github.com/BenKelada/moodle

5 years agoMDL-52774 ajax: Require authentication when getting nav branch
Krista Koivisto [Thu, 4 Feb 2016 05:51:06 +0000 (13:51 +0800)]
MDL-52774 ajax: Require authentication when getting nav branch

When getting the navigation branch data through AJAX, require
login if forcelogin is set.

5 years agoMDL-52901 mod_assign: Check due dates in external save_submission
Juan Leyva [Wed, 27 Jan 2016 10:10:24 +0000 (11:10 +0100)]
MDL-52901 mod_assign: Check due dates in external save_submission

5 years agoMDL-52378 singleview: Using is_disabled instead of is_locked
David Monllao [Thu, 4 Feb 2016 08:17:40 +0000 (16:17 +0800)]
MDL-52378 singleview: Using is_disabled instead of is_locked

5 years agoMDL-52378 Singleview: Exclude Grade Attribute Permissions
Travis Noll [Wed, 2 Dec 2015 19:54:54 +0000 (13:54 -0600)]
MDL-52378 Singleview: Exclude Grade Attribute Permissions

Singleview users must have Manage Grade permission to modify the
Exclude grade attribute.

5 years agoMDL-52808 calendar: Do not return events for hidden activities
Juan Leyva [Mon, 18 Jan 2016 14:06:36 +0000 (15:06 +0100)]
MDL-52808 calendar: Do not return events for hidden activities

5 years agoMDL-52727 mod_data: Improve output of the form fields values
David Mudrák [Tue, 12 Jan 2016 12:59:30 +0000 (13:59 +0100)]
MDL-52727 mod_data: Improve output of the form fields values

This issue mostly affects the search form fields. Submitted values for
these fields are typically obtained via optional_param() with
PARAM_NOTAGS specified as the parameter type - see parse_search_field()
methods. Such values themselves are not safe enough to be printed back
directly into the HTML as they might contain malicious code.

While working on the patch, some other places with weak protection were
detected and fixed.

In case of the itemid parameters, explicit clean_param() is added to
make sure we cast the value as an integer. That should make the s()
unnecessary but it was added anyway as an extra protection (just in case
the code flow changes or the parts of the code are re-used elsewhere).

5 years agoMDL-53325 search: Remove commit from engine interface
Eric Merrill [Fri, 4 Mar 2016 03:06:49 +0000 (22:06 -0500)]
MDL-53325 search: Remove commit from engine interface

Remove commit from engine, and instead notify when indexes
start and stop, allowing them to decide what to do.

5 years agoMDL-53325 search: Optimize Solr less often
Eric Merrill [Thu, 3 Mar 2016 15:56:00 +0000 (10:56 -0500)]
MDL-53325 search: Optimize Solr less often

5 years agoMDL-53273 search: Use unicode safe string truncation
Eric Merrill [Mon, 29 Feb 2016 12:55:05 +0000 (07:55 -0500)]
MDL-53273 search: Use unicode safe string truncation

5 years agoMDL-41648 grade: Remove 'error' parameter in grading notification divs
dg711 [Sat, 27 Feb 2016 10:19:10 +0000 (15:49 +0530)]
MDL-41648 grade: Remove 'error' parameter in grading notification divs

5 years agoMDL-53353 drag-drop marker quetions: fix edit form jitter
Tim Hunt [Fri, 4 Mar 2016 17:41:54 +0000 (17:41 +0000)]
MDL-53353 drag-drop marker quetions: fix edit form jitter

5 years agoMDL-53350 drag-drop to text: layout problem on reivew
Tim Hunt [Fri, 4 Mar 2016 17:00:55 +0000 (17:00 +0000)]
MDL-53350 drag-drop to text: layout problem on reivew

5 years agoMDL-50032 webservice: Remove plugin functions from mobile service
Juan Leyva [Fri, 4 Mar 2016 13:15:33 +0000 (14:15 +0100)]
MDL-50032 webservice: Remove plugin functions from mobile service

5 years agoMDL-50032 webservice: Allow plugins to add functions into services
Juan Leyva [Thu, 3 Mar 2016 08:42:27 +0000 (09:42 +0100)]
MDL-50032 webservice: Allow plugins to add functions into services

5 years agoMDL-53047 login: Fixed #anchor being lost after login process
Brendan Heywood [Fri, 12 Feb 2016 04:41:16 +0000 (15:41 +1100)]
MDL-53047 login: Fixed #anchor being lost after login process

5 years agoMDL-52785 mod_quiz: New Web Service mod_quiz_get_user_best_grade
Juan Leyva [Fri, 15 Jan 2016 09:29:07 +0000 (10:29 +0100)]
MDL-52785 mod_quiz: New Web Service mod_quiz_get_user_best_grade

5 years agoMDL-52670 mod_quiz: New Web Service mod_quiz_get_user_attempts
Juan Leyva [Thu, 14 Jan 2016 12:11:02 +0000 (13:11 +0100)]
MDL-52670 mod_quiz: New Web Service mod_quiz_get_user_attempts

5 years agoMDL-50218 lti: Return empty grade when none exists
John Okely [Fri, 12 Feb 2016 06:04:57 +0000 (14:04 +0800)]
MDL-50218 lti: Return empty grade when none exists

5 years agoweekly release 3.1dev
Dan Poltawski [Fri, 4 Mar 2016 02:34:21 +0000 (10:34 +0800)]
weekly release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 4 Mar 2016 02:34:18 +0000 (10:34 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 Mar 2016 14:23:58 +0000 (22:23 +0800)]
Automatically generated installer lang files

5 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 Mar 2016 14:23:58 +0000 (22:23 +0800)]
Automatically generated installer lang files

5 years agoMDL-53327 search: add missing pluginfo lang strings
Dan Poltawski [Thu, 3 Mar 2016 09:00:48 +0000 (17:00 +0800)]
MDL-53327 search: add missing pluginfo lang strings

AMOS BEGIN
 CPY [searchengine,admin],[type_search,plugin]
AMOS END

5 years agoMDL-53247 adminlib: change ordering of global search setup helper
Dan Poltawski [Thu, 3 Mar 2016 08:30:37 +0000 (16:30 +0800)]
MDL-53247 adminlib: change ordering of global search setup helper

Now put 'enable global search' as last step, thanks to David for the
idea.

5 years agoMDL-53247 search: add cli indexer script
Dan Poltawski [Thu, 3 Mar 2016 07:32:27 +0000 (15:32 +0800)]
MDL-53247 search: add cli indexer script

5 years agoMerge branch 'MDL-30811-fix3' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 3 Mar 2016 07:09:47 +0000 (15:09 +0800)]
Merge branch 'MDL-30811-fix3' of git://github.com/andrewnicols/moodle

5 years agoMDL-30811 output: Adjust ARIA role to alert
Andrew Nicols [Thu, 3 Mar 2016 06:55:10 +0000 (14:55 +0800)]
MDL-30811 output: Adjust ARIA role to alert

https://www.w3.org/TR/wai-aria-practices/#alert

5 years agoMDL-30811 javascript: alert JS should be in template
Andrew Nicols [Thu, 3 Mar 2016 06:37:40 +0000 (14:37 +0800)]
MDL-30811 javascript: alert JS should be in template

By moving the JS required for an alert to the JavaScript we make it
possible for themers to use frameworks other than bootstrap if they so
wish.

5 years agoMDL-30811 javascript: Lazily load core dependencies
Andrew Nicols [Thu, 3 Mar 2016 06:37:25 +0000 (14:37 +0800)]
MDL-30811 javascript: Lazily load core dependencies

To prevent possible race conditions, we lazily load the templates, and ajax
dependencies.

5 years agoMDL-53247 search: allow search to be configured before enabled
Dan Poltawski [Thu, 3 Mar 2016 04:28:52 +0000 (12:28 +0800)]
MDL-53247 search: allow search to be configured before enabled

The seach manager no longer checks if search is enabled before providing
an instance. It's up to the callers to do the access control.

5 years agoMDL-48362 enrol_cohort: Correct variable naming for course sync
Andrew Nicols [Wed, 2 Mar 2016 23:55:07 +0000 (07:55 +0800)]
MDL-48362 enrol_cohort: Correct variable naming for course sync

$course->id => $instance->courseid

5 years agoMDL-53281 search: Properly set timeout, and don't wait for optimize
Eric Merrill [Wed, 2 Mar 2016 22:32:03 +0000 (17:32 -0500)]
MDL-53281 search: Properly set timeout, and don't wait for optimize

5 years agoMDL-53291 javascript: fix jquery ajax requests when data contains ??
Ben Kelada [Tue, 1 Mar 2016 02:38:44 +0000 (13:38 +1100)]
MDL-53291 javascript: fix jquery ajax requests when data contains ??

jQuery ajax requests containing multiple '?' get replaced with a
string similar to jQuery152330039032_1231231, this is because it
is processing a stringified data object as jsonp and thinks its a url.
 workaround is to add contenttype
see https://github.com/jquery/jquery/issues/1799

5 years agoAutomatically generated installer lang files
AMOS bot [Wed, 2 Mar 2016 16:04:04 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 2 Mar 2016 15:36:03 +0000 (16:36 +0100)]
Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle

5 years agoMDL-52974 mod_assign: Include missing local library
Juan Leyva [Wed, 2 Mar 2016 07:16:39 +0000 (08:16 +0100)]
MDL-52974 mod_assign: Include missing local library

5 years agoMDL-53050 mod_forum: fix for base highlight
Dan Poltawski [Wed, 2 Mar 2016 09:18:51 +0000 (17:18 +0800)]
MDL-53050 mod_forum: fix for base highlight

5 years agoMerge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 2 Mar 2016 07:49:45 +0000 (15:49 +0800)]
Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-50887 antivirus: clamav is standard plugin, missing strings
Marina Glancy [Wed, 2 Mar 2016 07:42:35 +0000 (15:42 +0800)]
MDL-50887 antivirus: clamav is standard plugin, missing strings

5 years agoMDL-52068 repository: Prevent JS errors due to unescaped lang strings
Frederic Massart [Thu, 18 Feb 2016 11:26:00 +0000 (19:26 +0800)]
MDL-52068 repository: Prevent JS errors due to unescaped lang strings

5 years agoMerge branch 'MDL-53214-master-category-feedback' of git://github.com/cameron1729...
Andrew Nicols [Wed, 2 Mar 2016 06:49:20 +0000 (14:49 +0800)]
Merge branch 'MDL-53214-master-category-feedback' of git://github.com/cameron1729/moodle

5 years agoMDL-53214 grades: Fix labels on feedback fields
Cameron Ball [Wed, 2 Mar 2016 06:16:20 +0000 (14:16 +0800)]
MDL-53214 grades: Fix labels on feedback fields

5 years agoMDL-30811 core: Initiate notifications on first use only
Andrew Nicols [Wed, 2 Mar 2016 05:03:59 +0000 (13:03 +0800)]
MDL-30811 core: Initiate notifications on first use only

5 years agoMerge branch 'MDL-52513' of https://github.com/rushi963/moodle
Dan Poltawski [Wed, 2 Mar 2016 05:23:56 +0000 (13:23 +0800)]
Merge branch 'MDL-52513' of https://github.com/rushi963/moodle

5 years agoMDL-52136 mod_forum: fix some out-of-sync stuff
Eloy Lafuente (stronk7) [Wed, 2 Mar 2016 04:38:03 +0000 (05:38 +0100)]
MDL-52136 mod_forum: fix some out-of-sync stuff

Thanks CIs!

5 years agoMerge branch 'MDL-48362-master-fix3' of http://github.com/damyon/moodle
Andrew Nicols [Wed, 2 Mar 2016 04:36:56 +0000 (12:36 +0800)]
Merge branch 'MDL-48362-master-fix3' of github.com/damyon/moodle

5 years agoMDL-48362 enrol: Fixes to cohort and manual enrol plugins
Damyon Wiese [Wed, 2 Mar 2016 04:34:00 +0000 (12:34 +0800)]
MDL-48362 enrol: Fixes to cohort and manual enrol plugins

These were regressions from the change to use the standard editing ui
for enrolment plugins.

5 years agoMerge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 2 Mar 2016 04:25:57 +0000 (05:25 +0100)]
Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-52136 mod_forum: forum_post is templatable
Andrew Nicols [Wed, 2 Mar 2016 04:01:42 +0000 (12:01 +0800)]
MDL-52136 mod_forum: forum_post is templatable

5 years agoMerge branch 'MDL-52397_behat2' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 2 Mar 2016 03:48:39 +0000 (11:48 +0800)]
Merge branch 'MDL-52397_behat2' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'wip-mdl-51075' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 2 Mar 2016 03:47:13 +0000 (11:47 +0800)]
Merge branch 'wip-mdl-51075' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-51075 behat: Fixed exported question file size
Rajesh Taneja [Wed, 2 Mar 2016 03:39:10 +0000 (11:39 +0800)]
MDL-51075 behat: Fixed exported question file size

5 years agoMDL-52397 behat: Another behat fix, there is no student2 grade
David Monllao [Wed, 2 Mar 2016 03:03:01 +0000 (11:03 +0800)]
MDL-52397 behat: Another behat fix, there is no student2 grade

5 years agoMerge branch 'MDL-52489_master' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 2 Mar 2016 01:08:29 +0000 (09:08 +0800)]
Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle

5 years agoMDL-52136 mod_forum: Correctly quote get_string vars in mustache
Andrew Nicols [Tue, 12 Jan 2016 12:08:13 +0000 (20:08 +0800)]
MDL-52136 mod_forum: Correctly quote get_string vars in mustache

5 years agoMDL-52136 core: Add support for quoting variables in mustache helpers
Andrew Nicols [Fri, 12 Feb 2016 04:42:41 +0000 (12:42 +0800)]
MDL-52136 core: Add support for quoting variables in mustache helpers

This is required for when helpers include json-encoded variables as arguments.
As an example, imagine a template with content:

{{# str }} somekey, someidentifier, { "fullname": "{{ fullname }}" } {{/ str }}

If the fullname variable were to include the double-quote character (e.g.
John "Trevor" Doe) because of the way in which mustache renders content, it
would become:

{{# str }} somekey, someidentifier, { "fullname": "John "Trevor" Doe" } {{/ str }}

This results in an invalid JSON structure.

To work around this issue, the quote characters in the passed variable
must be escaped:

{{# str }} somekey, someidentifier, { "fullname": "John \"Trevor\" Doe" } {{/ str }}

Unfortunately, Mustache provides no way of doing so natively.

With this function, we can quote the text as appropriate:

{{# str }} somekey, someidentifier, { "fullname": {{# quote }}{{ fullname }}{{/ quote }} } {{/ str }}

This also handles the case where the quoted content includes the Mustache
delimeter ({{ or }}).

For example:
fullname = 'John "}}Trevor{{" Doe'

Ordinarily this would be rendered as:
{{# str }} somekey, someidentifier, { "fullname": "John "}}Trevor{{" Doe" } {{/ str }}

This rendering is both a JSON error, and also a mustache syntax error because of the mustache delimeters.

The quote helper also escapes these by wrapping them in change delimeter
tags:

{{# str }} somekey, someidentifier, { "fullname": "John "{{=<% %>=}}}}<%={{ }}=%>Trevor{{=<% %>=}}{{{{=<% %>=}}" Doe" } {{/ str }}

5 years agoMerge branch 'MDL-36652' of https://github.com/rushi963/moodle
Eloy Lafuente (stronk7) [Tue, 1 Mar 2016 21:01:44 +0000 (22:01 +0100)]
Merge branch 'MDL-36652' of https://github.com/rushi963/moodle