David Monllao [Tue, 15 Mar 2016 00:58:33 +0000 (08:58 +0800)]
Merge branch 'MDL-52934-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 19 Feb 2016 10:09:43 +0000 (18:09 +0800)]
MDL-52934 repository_boxnet: Deprecate v1 to v2 migration tool
David Monllao [Mon, 14 Mar 2016 06:35:00 +0000 (14:35 +0800)]
Merge branch 'wip-mdl-46891-fix' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Mon, 14 Mar 2016 06:24:36 +0000 (14:24 +0800)]
MDL-46891 behat: Increment counter
David Monllao [Mon, 14 Mar 2016 06:17:41 +0000 (14:17 +0800)]
Merge branch 'MDL-53102-messageid' of https://github.com/brendanheywood/moodle
David Monllao [Mon, 14 Mar 2016 05:59:21 +0000 (13:59 +0800)]
Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle
Andrew Nicols [Mon, 14 Mar 2016 05:35:32 +0000 (13:35 +0800)]
Merge branch 'MDL-53252_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 14 Mar 2016 05:26:12 +0000 (13:26 +0800)]
Merge branch 'MDL-53304' of git://github.com/timhunt/moodle
Brendan Heywood [Wed, 2 Mar 2016 08:45:51 +0000 (19:45 +1100)]
MDL-53102 tests: corrected phpdocs in email diversion tests
(Introduced by previous patch MDL-52818)
Brendan Heywood [Mon, 15 Feb 2016 02:38:30 +0000 (13:38 +1100)]
MDL-53102 email: Ensure all emails generate consistent Message-ID URLs
Andrew Nicols [Mon, 14 Mar 2016 03:17:40 +0000 (11:17 +0800)]
Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle
Andrew Nicols [Mon, 14 Mar 2016 02:58:25 +0000 (10:58 +0800)]
Merge branch 'MDL-52821-master' of https://github.com/xow/moodle
David Monllao [Fri, 26 Feb 2016 02:52:10 +0000 (10:52 +0800)]
MDL-53252 grades: Skip user regrading if only feedback changes
Dani Palou [Fri, 30 Oct 2015 12:43:39 +0000 (13:43 +0100)]
MDL-51986 wiki: Add tests for mod_wiki_get_page_contents
Dani Palou [Fri, 30 Oct 2015 11:20:33 +0000 (12:20 +0100)]
MDL-51986 wiki: New WS mod_wiki_get_page_contents
Dani Palou [Fri, 23 Oct 2015 13:51:26 +0000 (15:51 +0200)]
MDL-51887 wiki: Add tests for mod_wiki_get_subwiki_pages
Dani Palou [Fri, 23 Oct 2015 11:19:34 +0000 (13:19 +0200)]
MDL-51887 wiki: New WS mod_wiki_get_subwiki_pages
Eloy Lafuente (stronk7) [Fri, 11 Mar 2016 02:57:03 +0000 (03:57 +0100)]
Merge branch 'wip-mdl-46891' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Fri, 4 Mar 2016 07:12:58 +0000 (15:12 +0800)]
MDL-46891 behat: Point to moodle-behat-extension
Rajesh Taneja [Fri, 4 Mar 2016 05:33:41 +0000 (13:33 +0800)]
MDL-46891 behat: Improved exit status of parallel run
Exit status should contain pass/fail information
of each run it is executing. Every bit of status
will have information of pass/fail status of parallel
process
Rajesh Taneja [Wed, 2 Mar 2016 09:07:46 +0000 (17:07 +0800)]
MDL-46891 behat: Added support for $CFG->behat_profiles
This config will be supported to avoid broken configuration
in future. As this is limited, we need will still use
->behat_config to set config values which can't be set by
behat_profiles
Rajesh Taneja [Thu, 3 Mar 2016 07:20:37 +0000 (15:20 +0800)]
MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
with few drivers, increasing size of window to ensure
grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
Rajesh Taneja [Wed, 2 Mar 2016 07:22:56 +0000 (15:22 +0800)]
MDL-46891 core_grade: Steps are not valid as element is disabled
Rajesh Taneja [Thu, 25 Feb 2016 05:39:33 +0000 (13:39 +0800)]
MDL-46891 behat: Phantomjs require explicit change event
It fails with multiple select while selecting group
Rajesh Taneja [Fri, 29 Jan 2016 08:16:34 +0000 (16:16 +0800)]
MDL-46891 behat: If setup problem then stop execution
Exception are handled via CallCenter and execution is
not stopped if execption is thrown in beforescenario.
If any setup problem encountered, then stop execution.
Rajesh Taneja [Fri, 22 Jan 2016 06:16:27 +0000 (14:16 +0800)]
MDL-46891 behat: Move wait in behat_base so it can be used easily
Rajesh Taneja [Tue, 16 Dec 2014 01:02:17 +0000 (09:02 +0800)]
MDL-46891 behat: Optimised login step and context helper
Rajesh Taneja [Tue, 9 Dec 2014 09:00:58 +0000 (17:00 +0800)]
MDL-46891 Behat: Added support for behat 3
Eloy Lafuente (stronk7) [Thu, 10 Mar 2016 12:30:56 +0000 (13:30 +0100)]
weekly release 3.1dev
Eloy Lafuente (stronk7) [Thu, 10 Mar 2016 12:30:51 +0000 (13:30 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Thu, 10 Mar 2016 08:26:04 +0000 (16:26 +0800)]
MDL-27628 behat: Added delay to ensure the value is set.
After user type there is a 400ms delay, then search
Adding 2 sec delay to ensure search is finished before
click event is triggred
Mark Nelson [Thu, 10 Mar 2016 03:13:53 +0000 (11:13 +0800)]
MDL-52252 core_course: removed unused variables
The call to 'context_coursecat::instance($COURSE->category);'
was causing Moodle to throw an exception due to non-existent
category.
Damyon Wiese [Thu, 10 Mar 2016 02:37:33 +0000 (10:37 +0800)]
MDL-27628 enrol_meta: Set options to exclude existing courses, and the current course
When adding a new meta enrolment, you should not be able to select the current course,
or any courses with an existing meta link.
Eloy Lafuente (stronk7) [Wed, 9 Mar 2016 23:05:43 +0000 (00:05 +0100)]
MDL-51167 tool_monitor: fix too strict condition & minor cleanup
Eloy Lafuente (stronk7) [Wed, 9 Mar 2016 17:59:28 +0000 (18:59 +0100)]
Merge branch 'MDL-53369' of git://github.com/timhunt/moodle
Simey Lameze [Mon, 18 Jan 2016 01:37:38 +0000 (09:37 +0800)]
MDL-50705 auth_db: apply standard cleaning to all fields
Also unit tests were added to cover the new clean_data() method.
Simey Lameze [Mon, 18 Jan 2016 01:38:17 +0000 (09:38 +0800)]
MDL-50705 core_user: introduce new fill_properties_cache()
Also the get_property_definition() was created to get the property without retrieve the whole definition cache and
unit tests were created to tests those new methods.
David Monllao [Wed, 9 Mar 2016 08:00:26 +0000 (16:00 +0800)]
Merge branch 'MDL-27628-master' of git://github.com/damyon/moodle
David Monllao [Wed, 9 Mar 2016 07:36:30 +0000 (15:36 +0800)]
MDL-52252 tags: Bump version to add course_modules area
David Monllao [Wed, 9 Mar 2016 07:35:16 +0000 (15:35 +0800)]
Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle
Marina Glancy [Mon, 7 Mar 2016 04:17:45 +0000 (12:17 +0800)]
MDL-52252 tags: course module tags small correction
David Monllao [Wed, 9 Mar 2016 07:29:41 +0000 (15:29 +0800)]
MDL-52786 quiz: Adding mod_quiz_get_combined_review_options to mobile service
David Monllao [Wed, 9 Mar 2016 07:29:02 +0000 (15:29 +0800)]
Merge branch 'MDL-52786-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
David Monllao [Wed, 9 Mar 2016 07:18:11 +0000 (15:18 +0800)]
MDL-52785 quiz: Adding mod_quiz_get_user_best_grade to mobile service
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
David Monllao [Wed, 9 Mar 2016 07:12:10 +0000 (15:12 +0800)]
MDL-52670 quiz: Adding function to mobile service
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
David Monllao [Wed, 9 Mar 2016 06:20:18 +0000 (14:20 +0800)]
Merge branch 'MDL-51324-master' of git://github.com/damyon/moodle
Nadav Kavalerchik [Sun, 21 Feb 2016 14:10:47 +0000 (16:10 +0200)]
MDL-52252 Tags: Add tags to modules (Resources and Activities)
Andrew Nicols [Wed, 9 Mar 2016 05:54:52 +0000 (13:54 +0800)]
MDL-53273 search: Whitespace fix
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
Andrew Nicols [Wed, 9 Mar 2016 06:05:00 +0000 (14:05 +0800)]
Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle
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
Damyon Wiese [Mon, 21 Sep 2015 08:45:56 +0000 (16:45 +0800)]
MDL-27628 enrol_meta: Use new multi-course selector
Allows adding multiple instances of the meta enrol plugin at once.
I had to add support to the autocomplete element for filling the field from behat
when it was not using tags. I also had to make the shortnames more easily searchable
and unique in the behat feature file.
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".
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.
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
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
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
Andrew Nicols [Wed, 9 Mar 2016 05:18:09 +0000 (13:18 +0800)]
MDL-49897 calendar: mktime => usergetmidnight
Andrew Nicols [Wed, 9 Mar 2016 04:05:08 +0000 (12:05 +0800)]
MDL-51571 lti: Whitespace fixes
Andrew Nicols [Wed, 9 Mar 2016 03:11:32 +0000 (11:11 +0800)]
Merge branch 'MDL-51571_ltiErrorHandler' of https://github.com/moodlerooms/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
David Monllao [Wed, 9 Mar 2016 02:55:18 +0000 (10:55 +0800)]
Merge branch 'MDL-50032-master' of git://github.com/jleyva/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
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
AMOS bot [Tue, 8 Mar 2016 16:04:02 +0000 (00:04 +0800)]
Automatically generated installer lang files
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).
Tim Hunt [Mon, 7 Mar 2016 15:22:54 +0000 (15:22 +0000)]
MDL-53369 qtype_ddwtos: prevent boxes on consecutive lines touching
Juan Leyva [Fri, 15 Jan 2016 10:45:04 +0000 (11:45 +0100)]
MDL-52786 mod_quiz: New WS mod_quiz_get_combined_review_options
Juan Leyva [Fri, 4 Mar 2016 10:34:35 +0000 (11:34 +0100)]
MDL-52786 mod_quiz: Fix quiz_get_combined_reviewoptions
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.