Eloy Lafuente (stronk7) [Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)]
Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle
Dan Poltawski [Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)]
Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 2 Aug 2016 11:17:03 +0000 (12:17 +0100)]
Merge branch 'MDL-45734_m32v4' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 2 Aug 2016 09:54:28 +0000 (10:54 +0100)]
Merge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 2 Aug 2016 09:54:21 +0000 (10:54 +0100)]
Merge branch 'MDL-54847-master' of git://github.com/cameron1729/moodle
Cameron Ball [Thu, 21 Jul 2016 08:04:29 +0000 (16:04 +0800)]
MDL-54847 MDL-54847 weblib: Support basic HTML media tags
Andrew Nicols [Tue, 2 Aug 2016 02:29:30 +0000 (10:29 +0800)]
Merge branch 'MDL-55355-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 2 Aug 2016 02:10:38 +0000 (10:10 +0800)]
Merge branch 'MDL-55352-master-fix' of https://github.com/lameze/moodle
Simey Lameze [Tue, 2 Aug 2016 01:23:18 +0000 (09:23 +0800)]
MDL-55352 mod_feedback: Change series labels on multi choice rated
Andrew Nicols [Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)]
Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 2 Aug 2016 00:48:36 +0000 (08:48 +0800)]
Merge branch 'MDL-55140_m32v2' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 1 Aug 2016 17:57:00 +0000 (18:57 +0100)]
Merge branch 'MDL-55360-master-workshopgradepass' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 1 Aug 2016 15:07:43 +0000 (16:07 +0100)]
MDL-55376 assign: trailing whitespace
Dan Poltawski [Mon, 1 Aug 2016 15:07:00 +0000 (16:07 +0100)]
Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 1 Aug 2016 13:25:38 +0000 (14:25 +0100)]
Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 1 Aug 2016 12:58:20 +0000 (13:58 +0100)]
Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 1 Aug 2016 12:50:37 +0000 (13:50 +0100)]
Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 1 Aug 2016 08:30:33 +0000 (09:30 +0100)]
Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 1 Aug 2016 07:04:17 +0000 (15:04 +0800)]
Merge branch 'MDL-53152-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 18 Jul 2016 05:31:30 +0000 (13:31 +0800)]
MDL-53152 theme: Add parentheses to variable calculations
Simey Lameze [Thu, 28 Jul 2016 07:58:14 +0000 (15:58 +0800)]
MDL-55367 report_log: Prevent invalid time to be passed to Charts API
Andrew Nicols [Mon, 1 Aug 2016 02:49:15 +0000 (10:49 +0800)]
Merge branch 'MDL-55266-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 1 Aug 2016 01:54:06 +0000 (09:54 +0800)]
Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle
Stephen Bourget [Mon, 1 Aug 2016 01:45:27 +0000 (21:45 -0400)]
MDL-50286 report_log: Allow filtering by event origin.
Simey Lameze [Fri, 29 Jul 2016 02:13:37 +0000 (10:13 +0800)]
MDL-55355 core: Change chart link text when status change
Marina Glancy [Thu, 28 Jul 2016 03:42:40 +0000 (11:42 +0800)]
MDL-33741 file_info: show courses in hidden categories
This also has a couple of bugfixes:
- file_info_context_system::get_children() was looking for courses with parent=0, it is impossible, block removed;
- file_info_context_coursecat::get_area_coursecat_description() was checking the wrong capability to view files in description
Marina Glancy [Fri, 19 Jul 2013 07:02:33 +0000 (17:02 +1000)]
MDL-33741 file_info: check capability when serving file in coursecat description
Andrew Nicols [Mon, 1 Aug 2016 00:46:54 +0000 (08:46 +0800)]
Merge branch 'MDL-55289-master-exsubmission' of git://github.com/mudrd8mz/moodle
Stephen Bourget [Sat, 30 Jul 2016 01:51:05 +0000 (21:51 -0400)]
MDL-45734 Badges: Add additional events
Cameron Ball [Fri, 29 Jul 2016 09:39:10 +0000 (17:39 +0800)]
MDL-55376 mod_assign: Fix bug stopping admin from editing submissions
David Monllao [Fri, 29 Jul 2016 05:59:32 +0000 (13:59 +0800)]
MDL-55357 search: Contents include UTF8 characters, adding u modifier
Simey Lameze [Fri, 29 Jul 2016 04:42:24 +0000 (12:42 +0800)]
MDL-55352 core: Label values series should override tooltip
Damyon Wiese [Fri, 29 Jul 2016 02:43:25 +0000 (10:43 +0800)]
MDL-55374 mod_assign: Force utf-8 for DOMDocument
This prevents charset issues on some sites.
Juan Leyva [Thu, 21 Jul 2016 14:42:58 +0000 (15:42 +0100)]
MDL-55266 user: New WS core_user_get_user_preferences
Dani Palou [Wed, 27 Jul 2016 07:05:58 +0000 (09:05 +0200)]
MDL-55348 wiki: Convert 'section' WS params to PARAM_RAW
David Mudrák [Wed, 27 Jul 2016 15:11:39 +0000 (17:11 +0200)]
MDL-55360 workshop: Add tests for setting grades to pass via mod form
These scenarios should cover common cases of defining the grades to pass
pass via the workshop settings form. Note that behaviour of the fields
in terms of locale-specific decimals input (MDL-51806) is not covered
with these tests as I want to avoid installation of additional language
pack. Instead, I assume that functionality of unformat_float() is tested
separately in the core.
David Mudrák [Wed, 27 Jul 2016 14:22:12 +0000 (16:22 +0200)]
MDL-55360 workshop: Emptying grades to pass should set them to zero
When editing existing workshop with a grade to pass defined, when the
field is emptied, it should be interpreted as setting it to zero. This
was not happening because unformat_float replaces the field with null,
therefore effectively unsetting it.
By casting to float, we interpret all empty values (including null) as
zeros. This behaviour is consistent with how gradebook setup UI works.
David Mudrák [Wed, 27 Jul 2016 14:20:18 +0000 (16:20 +0200)]
MDL-55360 workshop: Allow creating workshops with empty grades to pass
As a regression of MDL-55360, it was not possible to create new
workshops if the field "Submission grade to pass" or "Assessment grade
to pass" was left empty. The validation failed with "You must enter a
number here".
The fields submissiongradepass and gradinggradepass are always present
as we explicitly define them in the mod form. So the isset() condition
in the validation was useless and it did not allow to submit the form
with these fields empty.
Additionally, the unformat_float() returns null only if it receives
empty value on the input. Which can't happen in our case so I am
removing this condition to improve the readability of the code.
David Mudrák [Mon, 25 Jul 2016 17:40:26 +0000 (19:40 +0200)]
MDL-55289 workshop: Fix files processing in example submissions
While testing the issue MDL-55289 I realized that attaching files to
workshop example submissions does not work at all and throws an error.
The reason was that in MDL-50794 (
996f7e82), the variables $contentopts
and $attachmentopts were replaced with the result of the methods
submission_content_options() and submission_attachment_options().
But I forgot to perform the full refactoring in exsubmission.php too.
Attached behat test should cover both issues on this branch.
David Mudrák [Mon, 25 Jul 2016 17:30:30 +0000 (19:30 +0200)]
MDL-55289 workshop: Include repository/lib.php to use its constants
As a result of MDL-41556 (
146893d6), the repository/lib.php was included
in submission.php so that its constant FILE_INTERNAL could be used in
field options. Recent development in MDL-50794 (
996f7e8) moved the
options declaration to standalone methods but we forgot to check they
work in exsubmission.php too.
This patch moves the repository/lib.php inclusion to where the
library is actually needed.
Additionally it unifies how options are set for overall feedback content
and overall feedback attachment fields.
Jun Pataleta [Mon, 25 Jul 2016 06:40:45 +0000 (14:40 +0800)]
MDL-55323 enrol_lti: Remove unused required parameter
Jun Pataleta [Thu, 9 Jun 2016 08:45:31 +0000 (16:45 +0800)]
MDL-54879 mod_lti: Add fallback options for error message upon failure
David Monllao [Thu, 28 Jul 2016 04:07:20 +0000 (12:07 +0800)]
weekly release 3.2dev
Stephen Bourget [Wed, 27 Jul 2016 11:18:54 +0000 (07:18 -0400)]
MDL-55140 mod_choice: Allow independent open and close dates
Dan Poltawski [Wed, 27 Jul 2016 06:58:33 +0000 (07:58 +0100)]
Merge branch 'MDL-55287_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Wed, 27 Jul 2016 05:56:31 +0000 (13:56 +0800)]
MDL-55287 search: Custom error message if solr extension is not installed
Correcting engine is not installed lang string as well.
David Monllao [Wed, 27 Jul 2016 05:17:33 +0000 (13:17 +0800)]
Merge branch 'wip-mdl-54987' of https://github.com/rajeshtaneja/moodle
Mark Nelson [Wed, 27 Jul 2016 03:42:47 +0000 (11:42 +0800)]
MDL-54984 core_cache: corrected exception message
Rajesh Taneja [Wed, 27 Jul 2016 03:00:54 +0000 (11:00 +0800)]
MDL-54987 behat: Fixed feedback scenarios to display chart data
Now chart data is not visible by default,
we need to click 'Show chart data' to view.
Also, extra space is not required between
% as it's done by chart library
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 22:59:19 +0000 (00:59 +0200)]
Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 22:19:40 +0000 (00:19 +0200)]
Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 21:44:54 +0000 (23:44 +0200)]
Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 18:15:13 +0000 (20:15 +0200)]
Merge branch 'wip-MDL-51735-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 17:56:20 +0000 (19:56 +0200)]
Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 17:54:53 +0000 (19:54 +0200)]
Merge branch 'MDL-54801-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 17:45:18 +0000 (19:45 +0200)]
MDL-55046 assign: document the new return values
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 17:40:52 +0000 (19:40 +0200)]
Merge branch 'MDL-55046-master' of git://github.com/dpalou/moodle
Eloy Lafuente (stronk7) [Tue, 26 Jul 2016 11:12:07 +0000 (13:12 +0200)]
Merge branch 'wip-mdl-55337' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 26 Jul 2016 02:14:53 +0000 (10:14 +0800)]
MDL-55337 behat: Added 1 sec delay between post
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
Dan Poltawski [Tue, 26 Jul 2016 10:57:09 +0000 (11:57 +0100)]
Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 26 Jul 2016 08:55:33 +0000 (09:55 +0100)]
Merge branch 'MDL-54987-master-fixes' of https://github.com/lameze/moodle
Dan Poltawski [Tue, 26 Jul 2016 08:52:42 +0000 (09:52 +0100)]
Merge branch 'MDL-54984-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 26 Jul 2016 08:41:24 +0000 (09:41 +0100)]
MDL-49533 version: bump
Dan Poltawski [Tue, 26 Jul 2016 08:40:17 +0000 (09:40 +0100)]
Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle
Simey Lameze [Tue, 26 Jul 2016 07:51:45 +0000 (15:51 +0800)]
MDL-54987 mod_choice: Fix notices and behat failures
Dan Poltawski [Tue, 26 Jul 2016 08:14:45 +0000 (09:14 +0100)]
Merge branch 'MDL-50051-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 26 Jul 2016 08:13:10 +0000 (09:13 +0100)]
Merge branch 'MDL-54988-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 11 Jul 2016 07:29:14 +0000 (15:29 +0800)]
MDL-50267 lang: Remove deprecated strings in 2.9
David Monllao [Tue, 26 Jul 2016 02:33:21 +0000 (10:33 +0800)]
Merge branch 'MDL-55325-master' of https://github.com/xow/moodle
David Monllao [Tue, 26 Jul 2016 02:14:30 +0000 (10:14 +0800)]
Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
Conflicts:
lib/upgrade.txt
Rajesh Taneja [Tue, 5 Jul 2016 05:26:31 +0000 (13:26 +0800)]
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
David Monllao [Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)]
Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Andrew Nicols [Mon, 11 Jul 2016 06:50:09 +0000 (14:50 +0800)]
MDL-49533 repository: Remove the Alfresco plugin
The SDK that this plugin was designed around is not compatible with recent
versions of Alfresco so the decisio has been made to move the repository to
the plugins database.
David Monllao [Mon, 25 Jul 2016 21:12:00 +0000 (05:12 +0800)]
Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle
David Monllao [Mon, 25 Jul 2016 21:04:03 +0000 (05:04 +0800)]
Merge branch 'MDL-55283-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 25 Jul 2016 20:35:02 +0000 (04:35 +0800)]
MDL-45753 test: Adding core_my testsuite
David Monllao [Mon, 25 Jul 2016 20:27:48 +0000 (04:27 +0800)]
Merge branch 'MDL-55254_m32v3' of https://github.com/sbourget/moodle
David Monllao [Mon, 25 Jul 2016 20:05:18 +0000 (04:05 +0800)]
MDL-45753 events: Fix event context
David Monllao [Mon, 25 Jul 2016 20:03:14 +0000 (04:03 +0800)]
Merge branch 'MDL-45753_m32v4' of https://github.com/sbourget/moodle
Conflicts:
version.php
David Monllao [Mon, 25 Jul 2016 18:40:35 +0000 (02:40 +0800)]
Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Mon, 18 Jul 2016 09:45:05 +0000 (17:45 +0800)]
MDL-54984 cache: Added todo tags to items for 3.3 deprecations
Jun Pataleta [Fri, 15 Jul 2016 06:37:33 +0000 (14:37 +0800)]
MDL-54984 cache: 3.2 final deprecations
Jun Pataleta [Tue, 12 Jul 2016 09:22:27 +0000 (17:22 +0800)]
MDL-54988 core: Final deprecation for lib/modinfolib methods
Final deprecation of the following methods:
- course_modinfo::build_section_cache()
- cm_info::get_deprecated_group_members_only()
- cm_info::is_user_access_restricted_by_group()
Plus throw coding exception for direct calls of the following:
- cm_info::get_url()
- cm_info::get_content()
- cm_info::get_extra_classes()
- cm_info::get_on_click()
- cm_info::get_custom_data()
- cm_info::get_after_link()
- cm_info::get_after_edit_icons()
- cm_info::obtain_dynamic_data()
Dan Poltawski [Mon, 25 Jul 2016 14:55:48 +0000 (15:55 +0100)]
Merge branch 'MDL-55287_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 25 Jul 2016 14:53:41 +0000 (15:53 +0100)]
Merge branch 'MDL-55284-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Jul 2016 14:27:23 +0000 (15:27 +0100)]
Merge branch 'MDL-54987-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 25 Jul 2016 10:21:05 +0000 (11:21 +0100)]
MDL-54987 charts: fix method name to match coding style
Dan Poltawski [Mon, 25 Jul 2016 09:58:45 +0000 (10:58 +0100)]
MDL-54987 charts: fix style issues
Simey Lameze [Mon, 25 Jul 2016 07:39:02 +0000 (15:39 +0800)]
MDL-54987 core: final charts project polishing
Simey Lameze [Thu, 14 Jul 2016 07:41:08 +0000 (15:41 +0800)]
MDL-55208 mod_choice: Convert choice results chart to new library
Part of MDL-54987 epic.
Simey Lameze [Fri, 22 Jul 2016 03:54:40 +0000 (11:54 +0800)]
MDL-55308 mod_feedback: Convert analysis chart to the new library
Part of MDL-54987 epic.
Simey Lameze [Fri, 22 Jul 2016 06:45:39 +0000 (14:45 +0800)]
MDL-55262 core: Add support for series values labels
Part of MDL-54987 epic.
Simey Lameze [Thu, 21 Jul 2016 01:58:04 +0000 (09:58 +0800)]
MDL-55037 core: Define a set of default colors
Part of MDL-54987 epic.
Simey Lameze [Thu, 14 Jul 2016 03:50:40 +0000 (11:50 +0800)]
MDL-55219 core: Add support for horizontal bars
Part of MDL-54987 epic.
Simey Lameze [Fri, 15 Jul 2016 06:11:14 +0000 (14:11 +0800)]
MDL-55025 report_stats: Use the new charting library
Part of MDL-54987 epic.
Simey Lameze [Wed, 6 Jul 2016 04:26:53 +0000 (12:26 +0800)]
MDL-55110 core: Add support for smooth lines
Part of MDL-54987 epic.
Frederic Massart [Thu, 7 Jul 2016 06:54:32 +0000 (14:54 +0800)]
MDL-55146 core: Support custom labels on X axis
Note that this is still limited as the number of labels is locked
to the number of elements in the series.
Part of MDL-54987 epic.
Frederic Massart [Thu, 7 Jul 2016 06:14:26 +0000 (14:14 +0800)]
MDL-55146 core: Support multiple axes in charts
Part of MDL-54987 epic.
Frederic Massart [Mon, 4 Jul 2016 10:38:05 +0000 (18:38 +0800)]
MDL-55089 core: Charts are displayed with a data table by default
Part of MDL-54987 epic.
Frederic Massart [Tue, 28 Jun 2016 10:28:22 +0000 (18:28 +0800)]
MDL-55039 core: First implementation of HTML table rendering for charts
Part of MDL-54987 epic.