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
Andrew Nicols [Wed, 9 Mar 2016 00:48:44 +0000 (08:48 +0800)]
Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/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
Simey Lameze [Tue, 8 Mar 2016 08:06:16 +0000 (16:06 +0800)]
MDL-53031 mod_assign: add session check on assignment plugins management
Jun Pataleta [Mon, 11 Jan 2016 03:05:51 +0000 (11:05 +0800)]
MDL-52433 user: Remove unnecessary capability check
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.
David Monllao [Tue, 8 Mar 2016 08:13:42 +0000 (16:13 +0800)]
Merge branch 'wip-mdl-53300' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 8 Mar 2016 07:31:17 +0000 (15:31 +0800)]
MDL-41648 gradingforms: Remove unnecessary attr
David Monllao [Tue, 8 Mar 2016 07:32:17 +0000 (15:32 +0800)]
Merge branch 'wip-MDL-41648' of https://github.com/dg711/moodle
Andrew Nicols [Tue, 8 Mar 2016 07:05:50 +0000 (15:05 +0800)]
Merge branch 'MDL-49897' of https://github.com/rushi963/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
Andrew Nicols [Tue, 8 Mar 2016 06:34:17 +0000 (14:34 +0800)]
Merge branch 'MDL-53010-master' of git://github.com/lameze/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
David Monllao [Tue, 8 Mar 2016 06:04:07 +0000 (14:04 +0800)]
Merge branch 'MDL-52984' of https://github.com/rushi963/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
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
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.
Simey Lameze [Mon, 29 Feb 2016 05:39:39 +0000 (13:39 +0800)]
MDL-51167 tool_monitor: check course visibility and user capabilities
Andrew Nicols [Tue, 8 Mar 2016 01:21:47 +0000 (09:21 +0800)]
Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/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
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.
David Monllao [Tue, 8 Mar 2016 01:04:01 +0000 (09:04 +0800)]
Merge branch 'MDL-53350' 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
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
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.
Juan Leyva [Wed, 27 Jan 2016 10:10:24 +0000 (11:10 +0100)]
MDL-52901 mod_assign: Check due dates in external save_submission
David Monllao [Thu, 4 Feb 2016 08:17:40 +0000 (16:17 +0800)]
MDL-52378 singleview: Using is_disabled instead of is_locked
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.
Juan Leyva [Mon, 18 Jan 2016 14:06:36 +0000 (15:06 +0100)]
MDL-52808 calendar: Do not return events for hidden activities
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).
dg711 [Sat, 27 Feb 2016 10:19:10 +0000 (15:49 +0530)]
MDL-41648 grade: Remove 'error' parameter in grading notification divs
Tim Hunt [Fri, 4 Mar 2016 17:41:54 +0000 (17:41 +0000)]
MDL-53353 drag-drop marker quetions: fix edit form jitter
Tim Hunt [Fri, 4 Mar 2016 17:00:55 +0000 (17:00 +0000)]
MDL-53350 drag-drop to text: layout problem on reivew
Brendan Heywood [Fri, 12 Feb 2016 04:41:16 +0000 (15:41 +1100)]
MDL-53047 login: Fixed #anchor being lost after login process
John Okely [Fri, 12 Feb 2016 06:04:57 +0000 (14:04 +0800)]
MDL-50218 lti: Return empty grade when none exists
Dan Poltawski [Fri, 4 Mar 2016 02:34:21 +0000 (10:34 +0800)]
weekly release 3.1dev
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
AMOS bot [Thu, 3 Mar 2016 14:23:58 +0000 (22:23 +0800)]
Automatically generated installer lang files
AMOS bot [Thu, 3 Mar 2016 14:23:58 +0000 (22:23 +0800)]
Automatically generated installer lang files
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
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.
Dan Poltawski [Thu, 3 Mar 2016 07:32:27 +0000 (15:32 +0800)]
MDL-53247 search: add cli indexer script
Dan Poltawski [Thu, 3 Mar 2016 07:09:47 +0000 (15:09 +0800)]
Merge branch 'MDL-30811-fix3' of git://github.com/andrewnicols/moodle
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
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.
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.
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.
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
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
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
AMOS bot [Wed, 2 Mar 2016 16:04:04 +0000 (00:04 +0800)]
Automatically generated installer lang files
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
Juan Leyva [Wed, 2 Mar 2016 07:16:39 +0000 (08:16 +0100)]
MDL-52974 mod_assign: Include missing local library
Dan Poltawski [Wed, 2 Mar 2016 09:18:51 +0000 (17:18 +0800)]
MDL-53050 mod_forum: fix for base highlight
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
Marina Glancy [Wed, 2 Mar 2016 07:42:35 +0000 (15:42 +0800)]
MDL-50887 antivirus: clamav is standard plugin, missing 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
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
Cameron Ball [Wed, 2 Mar 2016 06:16:20 +0000 (14:16 +0800)]
MDL-53214 grades: Fix labels on feedback fields
Andrew Nicols [Wed, 2 Mar 2016 05:03:59 +0000 (13:03 +0800)]
MDL-30811 core: Initiate notifications on first use only
Dan Poltawski [Wed, 2 Mar 2016 05:23:56 +0000 (13:23 +0800)]
Merge branch 'MDL-52513' of https://github.com/rushi963/moodle
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!
Andrew Nicols [Wed, 2 Mar 2016 04:36:56 +0000 (12:36 +0800)]
Merge branch 'MDL-48362-master-fix3' of github.com/damyon/moodle
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.
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
Andrew Nicols [Wed, 2 Mar 2016 04:01:42 +0000 (12:01 +0800)]
MDL-52136 mod_forum: forum_post is templatable
Dan Poltawski [Wed, 2 Mar 2016 03:48:39 +0000 (11:48 +0800)]
Merge branch 'MDL-52397_behat2' of git://github.com/dmonllao/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
Rajesh Taneja [Wed, 2 Mar 2016 03:39:10 +0000 (11:39 +0800)]
MDL-51075 behat: Fixed exported question file size
David Monllao [Wed, 2 Mar 2016 03:03:01 +0000 (11:03 +0800)]
MDL-52397 behat: Another behat fix, there is no student2 grade
Andrew Nicols [Wed, 2 Mar 2016 01:08:29 +0000 (09:08 +0800)]
Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 12 Jan 2016 12:08:13 +0000 (20:08 +0800)]
MDL-52136 mod_forum: Correctly quote get_string vars in mustache
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 }}
Eloy Lafuente (stronk7) [Tue, 1 Mar 2016 21:01:44 +0000 (22:01 +0100)]
Merge branch 'MDL-36652' of https://github.com/rushi963/moodle
Eloy Lafuente (stronk7) [Tue, 1 Mar 2016 20:35:03 +0000 (21:35 +0100)]
Merge branch 'wip-mdl-53126' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 1 Mar 2016 20:23:16 +0000 (21:23 +0100)]
Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
Rushikesh [Sun, 14 Feb 2016 14:17:37 +0000 (19:47 +0530)]
MDL-49897 Calendar : Calendar day view showing past events
Dan Poltawski [Tue, 1 Mar 2016 13:37:56 +0000 (21:37 +0800)]
MDL-50887 clam: upgrade step with wrong version
Rajesh Taneja [Tue, 1 Mar 2016 08:38:59 +0000 (16:38 +0800)]
MDL-53300 core_grade: use currentgradetype if modgrade_type is not set
If mod has grades, then while upgrading
modgrade_type is disabled. This will not post
it with form and hence validation fails.
To avoid above problem, use ->currentgradetype
if modgrade_type is not set
Dan Poltawski [Tue, 1 Mar 2016 06:56:58 +0000 (14:56 +0800)]
Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 1 Mar 2016 06:49:33 +0000 (14:49 +0800)]
Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Tue, 1 Mar 2016 06:35:54 +0000 (14:35 +0800)]
Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 1 Mar 2016 06:35:50 +0000 (14:35 +0800)]
Merge branch 'MDL-52397_fix-oracle' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 1 Mar 2016 06:31:29 +0000 (14:31 +0800)]
Merge branch 'MDL-48362-master-fix2' of github.com/damyon/moodle
David Monllao [Tue, 1 Mar 2016 06:29:27 +0000 (14:29 +0800)]
MDL-52397 mod_assign: Fix behat test
Damyon Wiese [Tue, 1 Mar 2016 06:25:48 +0000 (14:25 +0800)]
MDL-48362 enrol_cohort: Fix unit test by manually triggering sync
Sync is now automatically triggered by add/update instance. We need
to manually trigger sync before each part of the test to clean up
role assignments from the previous test.
Andrew Nicols [Tue, 1 Mar 2016 06:22:06 +0000 (14:22 +0800)]
MDL-50546 mod_quiz: Correct typos in WS docs
Andrew Nicols [Tue, 1 Mar 2016 05:41:35 +0000 (13:41 +0800)]
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
Mark Nelson [Fri, 12 Feb 2016 06:21:25 +0000 (14:21 +0800)]
MDL-52489 mod_assign: mentioned changes in upgrade.txt
Dan Poltawski [Tue, 1 Mar 2016 05:10:57 +0000 (13:10 +0800)]
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle
Dan Poltawski [Tue, 1 Mar 2016 05:03:06 +0000 (13:03 +0800)]
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
Andrew Nicols [Tue, 1 Mar 2016 04:58:54 +0000 (12:58 +0800)]
Merge branch 'MDL-48362-master-fix1' of github.com/damyon/moodle
Dan Poltawski [Tue, 1 Mar 2016 04:53:10 +0000 (12:53 +0800)]
Merge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 1 Mar 2016 04:38:54 +0000 (12:38 +0800)]
Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 1 Mar 2016 04:30:56 +0000 (12:30 +0800)]
Merge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/moodle
David Monllao [Tue, 1 Mar 2016 04:29:13 +0000 (12:29 +0800)]
MDL-52397 editpdf: Fix draft vs nondraft comparison
We can not rely on the db engine returning results in the same order
if no order is specified in get_comments and get_annotations.
Also fixing a related unit test.
Damyon Wiese [Tue, 1 Mar 2016 04:29:09 +0000 (12:29 +0800)]
MDL-48362 enrol_cohort: Perform immediate sync on add/update instance
This restores backwards compatible behaviour.
Andrew Hancox [Wed, 7 Oct 2015 10:52:08 +0000 (11:52 +0100)]
MDL-51687 mod_folder: Trigger event when downloading all files.
Dan Poltawski [Tue, 1 Mar 2016 04:26:33 +0000 (12:26 +0800)]
Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 1 Mar 2016 04:23:54 +0000 (12:23 +0800)]
Merge branch 'MDL-52809-master' of git://github.com/dpalou/moodle