moodle.git
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-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 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-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-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 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

5 years agoMerge branch 'wip-mdl-53126' of https://github.com/rajeshtaneja/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

5 years agoMerge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/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

5 years agoMDL-50887 clam: upgrade step with wrong version
Dan Poltawski [Tue, 1 Mar 2016 13:37:56 +0000 (21:37 +0800)]
MDL-50887 clam: upgrade step with wrong version

5 years agoMerge branch 'MDL-52669-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 1 Mar 2016 06:56:58 +0000 (14:56 +0800)]
Merge branch 'MDL-52669-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50887-master' of https://github.com/lucisgit/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

5 years agoMerge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/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

5 years agoMerge branch 'MDL-52397_fix-oracle' 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

5 years agoMerge branch 'MDL-48362-master-fix2' of http://github.com/damyon/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

5 years agoMDL-52397 mod_assign: Fix behat test
David Monllao [Tue, 1 Mar 2016 06:29:27 +0000 (14:29 +0800)]
MDL-52397 mod_assign: Fix behat test

5 years agoMDL-48362 enrol_cohort: Fix unit test by manually triggering sync
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.

5 years agoMDL-50546 mod_quiz: Correct typos in WS docs
Andrew Nicols [Tue, 1 Mar 2016 06:22:06 +0000 (14:22 +0800)]
MDL-50546 mod_quiz: Correct typos in WS docs

5 years agoMerge branch 'MDL-50546-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 1 Mar 2016 05:41:35 +0000 (13:41 +0800)]
Merge branch 'MDL-50546-master' of git://github.com/jleyva/moodle

5 years agoMDL-52489 mod_assign: mentioned changes in upgrade.txt
Mark Nelson [Fri, 12 Feb 2016 06:21:25 +0000 (14:21 +0800)]
MDL-52489 mod_assign: mentioned changes in upgrade.txt

5 years agoMerge branch 'MDL-53077' of git://github.com/Dave-B/moodle
Dan Poltawski [Tue, 1 Mar 2016 05:10:57 +0000 (13:10 +0800)]
Merge branch 'MDL-53077' of git://github.com/Dave-B/moodle

5 years agoMerge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes
Dan Poltawski [Tue, 1 Mar 2016 05:03:06 +0000 (13:03 +0800)]
Merge branch 'MDL-53166' of https://github.com/eugeneventer/moodle-fixes

5 years agoMerge branch 'MDL-48362-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Tue, 1 Mar 2016 04:58:54 +0000 (12:58 +0800)]
Merge branch 'MDL-48362-master-fix1' of github.com/damyon/moodle

5 years agoMerge branch 'MDL-53263-forum-reply-deeplink' of https://github.com/brendanheywood...
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

5 years agoMerge branch 'MDL-46424_master' of https://github.com/dmonllao/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

5 years agoMerge branch 'wip-MDL-44952-master' of https://github.com/marinaglancy/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

5 years agoMDL-52397 editpdf: Fix draft vs nondraft comparison
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.

5 years agoMDL-48362 enrol_cohort: Perform immediate sync on add/update instance
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.

5 years agoMDL-51687 mod_folder: Trigger event when downloading all files.
Andrew Hancox [Wed, 7 Oct 2015 10:52:08 +0000 (11:52 +0100)]
MDL-51687 mod_folder: Trigger event when downloading all files.

5 years agoMerge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 1 Mar 2016 04:26:33 +0000 (12:26 +0800)]
Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-52809-master' of git://github.com/dpalou/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

5 years agoMDL-44952 mod_feedback: set value for hidenoselect if disabled
Marina Glancy [Tue, 1 Mar 2016 04:21:00 +0000 (12:21 +0800)]
MDL-44952 mod_feedback: set value for hidenoselect if disabled

5 years agoMDL-30811 form: Remove continue from test.
Andrew Nicols [Tue, 1 Mar 2016 04:10:59 +0000 (12:10 +0800)]
MDL-30811 form: Remove continue from test.

5 years agoMDL-52974 mod_assign: Improve tests for view_submission_status
Andrew Nicols [Tue, 1 Mar 2016 03:46:13 +0000 (11:46 +0800)]
MDL-52974 mod_assign: Improve tests for view_submission_status

External tests only

5 years agoMerge branch 'MDL-52974-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 1 Mar 2016 03:48:16 +0000 (11:48 +0800)]
Merge branch 'MDL-52974-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 1 Mar 2016 03:34:04 +0000 (11:34 +0800)]
Merge branch 'MDL-52928-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 1 Mar 2016 02:43:12 +0000 (10:43 +0800)]
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 1 Mar 2016 02:40:27 +0000 (10:40 +0800)]
Merge branch 'MDL-53027-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-53050-forum-target' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 1 Mar 2016 02:38:55 +0000 (10:38 +0800)]
Merge branch 'MDL-53050-forum-target' of https://github.com/brendanheywood/moodle

5 years agoMerge branch 'MDL-53072_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 1 Mar 2016 02:12:46 +0000 (10:12 +0800)]
Merge branch 'MDL-53072_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle
Andrew Nicols [Tue, 1 Mar 2016 02:05:53 +0000 (10:05 +0800)]
Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle

5 years agoMerge branch 'MDL-53214-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 1 Mar 2016 01:40:44 +0000 (09:40 +0800)]
Merge branch 'MDL-53214-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 1 Mar 2016 00:59:31 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-53172-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Tue, 1 Mar 2016 00:07:56 +0000 (08:07 +0800)]
Merge branch 'MDL-50175-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-50887 tests: Increment number of plugins in core_component_testcase.
Ruslan Kabalin [Wed, 24 Feb 2016 15:01:08 +0000 (15:01 +0000)]
MDL-50887 tests: Increment number of plugins in core_component_testcase.

We have got one more core plugin now.

5 years agoMDL-50887 antivirus_clamav: Add unit tests for scanner class.
Ruslan Kabalin [Mon, 22 Feb 2016 16:09:33 +0000 (16:09 +0000)]
MDL-50887 antivirus_clamav: Add unit tests for scanner class.

We are using "stubbing" method to replace real component (clamav) control
points with doubles in order to avoid direct calls to clamav. For more
details, please refer to https://phpunit.de/manual/4.8/en/test-doubles.html

Notice, that while it is possible to use setExpectedException in the tests,
this does not seem play correctly with consecutive assertions in the same
test after exception is thrown (they seem omitted). Explicit try/catch
construction has been used in testing instead.

To run just this test, use:
vendor/bin/phpunit antivirus_clamav_scanner_testcase lib/antivirus/clamav/tests/scanner_test.php

5 years agoMDL-50887 antivirus: Add unit tests for manager class.
Ruslan Kabalin [Mon, 22 Feb 2016 16:05:14 +0000 (16:05 +0000)]
MDL-50887 antivirus: Add unit tests for manager class.

To run just this test, use:
vendor/bin/phpunit core_antivirus_testcase lib/tests/antivirus_test.php

5 years agoMDL-50887 antivirus_clamav: Access config properties using getter.
Ruslan Kabalin [Mon, 22 Feb 2016 11:46:59 +0000 (11:46 +0000)]
MDL-50887 antivirus_clamav: Access config properties using getter.

5 years agoMDL-50887 antivirus: Add config getter to base class.
Ruslan Kabalin [Mon, 22 Feb 2016 11:45:41 +0000 (11:45 +0000)]
MDL-50887 antivirus: Add config getter to base class.

Improving architecture to make it testable.

5 years agoMDL-50887 antivirus_clamav: Split scanning logic and results processing.
Ruslan Kabalin [Fri, 19 Feb 2016 09:35:54 +0000 (09:35 +0000)]
MDL-50887 antivirus_clamav: Split scanning logic and results processing.

This refactoring will make possible to assert scan results processing
behaviour in unit testing.

5 years agoMDL-50887 antivirus: Replace 'antiviruses' with 'antivirus plugins'.
Ruslan Kabalin [Wed, 17 Feb 2016 13:16:21 +0000 (13:16 +0000)]
MDL-50887 antivirus: Replace 'antiviruses' with 'antivirus plugins'.

Language string chnages as per Helen Foster's comments in the ticket.

5 years agoMDL-50887 antivirus: Refactor adminlib to use html_writer.
Ruslan Kabalin [Wed, 17 Feb 2016 13:14:09 +0000 (13:14 +0000)]
MDL-50887 antivirus: Refactor adminlib to use html_writer.

5 years agoMDL-50887 antivirus: Use namespace referenced classes.
Ruslan Kabalin [Mon, 12 Oct 2015 14:18:16 +0000 (15:18 +0100)]
MDL-50887 antivirus: Use namespace referenced classes.

5 years agoMerge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 29 Feb 2016 08:34:22 +0000 (16:34 +0800)]
Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd...
Dan Poltawski [Mon, 29 Feb 2016 08:15:27 +0000 (16:15 +0800)]
Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd8mz/moodle

5 years agoMerge branch 'MDL-53213' of https://github.com/mr-russ/moodle
Dan Poltawski [Mon, 29 Feb 2016 07:37:25 +0000 (15:37 +0800)]
Merge branch 'MDL-53213' of https://github.com/mr-russ/moodle

5 years agoMerge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 29 Feb 2016 07:20:44 +0000 (15:20 +0800)]
Merge branch 'MDL-52965_master' of git://github.com/dmonllao/moodle

5 years agoMDL-48362 enrol: Correct singleselect use in behat test
Andrew Nicols [Mon, 29 Feb 2016 07:16:09 +0000 (15:16 +0800)]
MDL-48362 enrol: Correct singleselect use in behat test