Andrew Nicols [Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)]
Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
Jake Dallimore [Mon, 24 Apr 2017 02:20:19 +0000 (10:20 +0800)]
MDL-58684 portfolio: use file id instead of stored_file
Andrew Nicols [Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)]
Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle
Eloy Lafuente (stronk7) [Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)]
Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)]
Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 3 May 2017 15:50:29 +0000 (16:50 +0100)]
Merge branch 'MDL-58772' of git://github.com/aolley/moodle
Dan Poltawski [Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)]
Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 3 May 2017 13:01:59 +0000 (14:01 +0100)]
Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 3 May 2017 12:30:43 +0000 (13:30 +0100)]
Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 3 May 2017 12:19:19 +0000 (13:19 +0100)]
Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 3 May 2017 11:17:13 +0000 (12:17 +0100)]
Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 3 May 2017 10:17:45 +0000 (11:17 +0100)]
Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle
David Mudrák [Tue, 2 May 2017 14:50:08 +0000 (16:50 +0200)]
MDL-58692 auth: Improve the migration of auth setting names
Some auth plugins used to have a mix of the legacy style of plugin names
in config_plugins table (such as 'auth/mnet') and the new correct
style (such as 'auth_mnet'). Attempting to rename the setting plugin via
low level SQL UPDATE could lead to duplicate key violation.
The patch introduces a new helper function to safely migrate the old
settings to the new ones, eventually informing the admin about the
values mismatch.
Dan Poltawski [Wed, 3 May 2017 09:39:51 +0000 (10:39 +0100)]
Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 3 May 2017 08:14:38 +0000 (09:14 +0100)]
MDL-58788 docs: Note new behat compatibility page
Cameron Ball [Wed, 12 Apr 2017 09:31:00 +0000 (17:31 +0800)]
MDL-58514 mod_assign: Apply consistent logic for overrides
Previously the assign submission page was using "lenient" logic
for overrides when more than one group override applied to a user
(i.e., use the earliest "open" date and the latest "due" date)
when really it should be using the sortorder as per the assign
grading table.
Jun Pataleta [Wed, 3 May 2017 08:41:38 +0000 (16:41 +0800)]
Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle
Jake Dallimore [Wed, 3 May 2017 07:56:55 +0000 (15:56 +0800)]
Merge branch 'MDL-58650_master' of git://github.com/markn86/moodle
Jun Pataleta [Wed, 3 May 2017 02:55:54 +0000 (10:55 +0800)]
MDL-58794 core_course: Use a simpler future timestamp for test
Jun Pataleta [Wed, 3 May 2017 06:41:13 +0000 (14:41 +0800)]
MDL-58798 theme_boost: Override font size for big icon fonts
Marina Glancy [Wed, 26 Apr 2017 07:04:25 +0000 (15:04 +0800)]
MDL-58670 blog: respect capability to search entries
Marina Glancy [Wed, 19 Apr 2017 04:04:47 +0000 (12:04 +0800)]
MDL-58635 blogs: check edited blog belongs to current user
Andrew Hancox [Tue, 7 Mar 2017 09:59:55 +0000 (09:59 +0000)]
MDL-58172 mod_choice: Make export choice respect id fields
David Monllao [Wed, 3 May 2017 02:28:52 +0000 (10:28 +0800)]
on-demand release 3.3beta+
David Monllao [Wed, 3 May 2017 02:28:51 +0000 (10:28 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Wed, 3 May 2017 00:32:04 +0000 (08:32 +0800)]
MDL-58746 core: Simplify environment check
Juan Leyva [Wed, 19 Apr 2017 11:02:34 +0000 (13:02 +0200)]
MDL-58434 mod_lesson: Display invalid responses in detailed report
In the detailed statistics view for one user attempt, the user response
for numerical question types was not being displayed.
This was only happening for incorrect responses.
AMOS bot [Tue, 2 May 2017 16:05:36 +0000 (00:05 +0800)]
Automatically generated installer lang files
Marina Glancy [Tue, 23 Jun 2015 02:09:32 +0000 (10:09 +0800)]
MDL-50670 course: correctly apply defaults for format options
Mark Nelson [Mon, 1 May 2017 05:12:47 +0000 (13:12 +0800)]
MDL-58650 core_message: always use 'popup' processor for messages
Andrew Nicols [Tue, 2 May 2017 06:48:35 +0000 (14:48 +0800)]
MDL-58754 competency: Change query for DISTINCT COUNT
Damyon Wiese [Tue, 2 May 2017 04:21:36 +0000 (12:21 +0800)]
MDL-58535 oauth: Make the refreshtoken protected
It is set in subclasses so it should be protected (it was working regardless).
Damyon Wiese [Tue, 2 May 2017 03:45:57 +0000 (11:45 +0800)]
MDL-58535 repository_onedrive: Use correct user
If the file was copied to a system account, we need to use the system oauth when accessing it.
Adam Olley [Tue, 2 May 2017 03:11:51 +0000 (12:41 +0930)]
MDL-58772 mod_feedback: Dont overwrite anonymous entries
The feedback module lets you alternate between responses being anonymised and
not anonymised. When the module is in anonymous mode, its possible for a single
user to make multiple responses.
However when the activity is switched to non-anon mode, if a user leaves a
follow up feedback, one of their previously anonymous responses is used, so
their new response stays anonymous and their old anon response is lost.
This change lets them leave a new non-anonymised feedback entry and retains all
previous anonymous responses instead of incorrectly reusing one of their anon
ones at random.
Andrew Nicols [Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)]
Merge branch 'MDL-57704-master' of https://github.com/xow/moodle
Damyon Wiese [Tue, 2 May 2017 02:03:58 +0000 (10:03 +0800)]
MDL-58535 oauth2: Don't rely on the return scopes
MS makes a big mess of returning scopes from oauth requests. They only return the custom MS scopes like
User.Read and they never return non-MS scopes (like openid, profile, email).
John Okely [Tue, 2 May 2017 01:11:23 +0000 (09:11 +0800)]
MDL-57704 ltiprovider: Don't force SSLv3
Andrew Nicols [Tue, 2 May 2017 01:00:07 +0000 (09:00 +0800)]
Merge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 6 Apr 2017 03:40:31 +0000 (11:40 +0800)]
MDL-55468 mod_feedback: revive export analysis to excel
Dan Poltawski [Mon, 1 May 2017 10:25:39 +0000 (11:25 +0100)]
Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle
Marina Glancy [Fri, 28 Apr 2017 02:36:53 +0000 (10:36 +0800)]
MDL-58665 dashboard: use bigger course object for completion
class completion_info will make an extra DB query to retrieve the course if course->enablecompletion is not present
Marina Glancy [Fri, 28 Apr 2017 02:35:29 +0000 (10:35 +0800)]
MDL-58665 mod_scorm: cache times in modinfo for performance
Damyon Wiese [Mon, 1 May 2017 05:59:15 +0000 (13:59 +0800)]
MDL-58535 repository_onedrive: Use the weblink
The permission has it's own weblink which is different from the link on the original doc.
Damyon Wiese [Mon, 1 May 2017 02:48:06 +0000 (10:48 +0800)]
MDL-58535 repository_onedrive: Better error
When OneDrive has never been initialised the Graph API returns an error. Detect this and
direct the user to log in to OneDrive.
Damyon Wiese [Mon, 1 May 2017 02:26:00 +0000 (10:26 +0800)]
MDL-58535 repository_onedrive: Integration review fixes
Fixes for some missing imports and unused variables.
Damyon Wiese [Thu, 27 Apr 2017 06:58:33 +0000 (14:58 +0800)]
MDL-58535 onedrive: Fix upload to system account
This was failing for personal accounts (but was fine for business).
Damyon Wiese [Mon, 10 Apr 2017 02:31:03 +0000 (10:31 +0800)]
MDL-58535 assign: Always pass file serving options.
This allows the mobile app to pass offline=1 in urls to files to force export/download of the source file
for controlled links.
Damyon Wiese [Fri, 7 Apr 2017 04:10:00 +0000 (12:10 +0800)]
MDL-58535 repository_onedrive: Controlled link fixes
It is impossible to reliable copy a file between users without downloading and uploading the file.
This sucks but it's true...
Andrew Nicols [Mon, 1 May 2017 07:22:53 +0000 (15:22 +0800)]
Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle
Jake Dallimore [Mon, 1 May 2017 06:51:43 +0000 (14:51 +0800)]
Merge branch 'MDL-58167-master' of git://github.com/lameze/moodle
Jun Pataleta [Mon, 1 May 2017 06:26:37 +0000 (14:26 +0800)]
Merge branch 'MDL-58632-master' of https://github.com/xow/moodle
David Monllao [Mon, 1 May 2017 05:41:07 +0000 (13:41 +0800)]
Merge branch 'MDL-58746-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Fri, 28 Apr 2017 02:35:14 +0000 (10:35 +0800)]
MDL-58665 mod_data: cache times in modinfo for performance
Marina Glancy [Fri, 28 Apr 2017 01:47:24 +0000 (09:47 +0800)]
MDL-58665 mod_choice: cache choice time in modinfo for performance
Marina Glancy [Fri, 21 Apr 2017 04:39:53 +0000 (12:39 +0800)]
MDL-58665 mod_feedback: avoid extra db queries on dashboard
Jake Dallimore [Mon, 1 May 2017 04:14:42 +0000 (12:14 +0800)]
Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle
Jun Pataleta [Mon, 1 May 2017 02:47:52 +0000 (10:47 +0800)]
Merge branch 'MDL-58720-master' of git://github.com/jleyva/moodle
Ryan Wyllie [Mon, 1 May 2017 02:18:57 +0000 (02:18 +0000)]
MDL-58732 block_myoverview: fix course view event groupings
Ryan Wyllie [Mon, 1 May 2017 02:17:47 +0000 (02:17 +0000)]
MDL-58732 block_myoverview: improve style of empty course palceholder
Ryan Wyllie [Mon, 1 May 2017 02:15:41 +0000 (02:15 +0000)]
MDL-58732 block_myoverview: add max-width to block content
Simey Lameze [Mon, 1 May 2017 01:30:38 +0000 (09:30 +0800)]
MDL-58167 theme: update accessibility templates on clean
Simey Lameze [Thu, 27 Apr 2017 06:06:36 +0000 (14:06 +0800)]
MDL-58167 block_myoverview: improve block accessibility
Andrew Nicols [Mon, 1 May 2017 00:51:37 +0000 (08:51 +0800)]
MDL-58746 core: Add environment check for finfo
David Mudrák [Fri, 28 Apr 2017 21:08:13 +0000 (23:08 +0200)]
MDL-58760 templates: Fix the template context documentation
This change was missed in the commit
663640f5 and I spotted it while
working on this issue.
David Mudrák [Fri, 28 Apr 2017 21:04:04 +0000 (23:04 +0200)]
MDL-58760 templates: Make {{#pix}} helper work with escaped icon key
There is a difference between how our PHP mustache engine and JS
mustache engine escaping works. If the icon key is not hard-coded in the
template but defined as a context variable, the JS mustache engine
escapes the forward slashes.
Dan Poltawski [Fri, 28 Apr 2017 11:36:29 +0000 (12:36 +0100)]
on-demand release 3.3beta+
Dan Poltawski [Fri, 28 Apr 2017 11:36:27 +0000 (12:36 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 28 Apr 2017 08:44:35 +0000 (09:44 +0100)]
Merge branch 'MDL-58643-master' of git://github.com/snake/moodle
Jake Dallimore [Fri, 28 Apr 2017 03:38:05 +0000 (11:38 +0800)]
MDL-58643 behat: ensure results are in first page + multi suite fix.
Jun Pataleta [Fri, 28 Apr 2017 03:59:47 +0000 (11:59 +0800)]
Merge branch 'MDL-58741-master' of git://github.com/jleyva/moodle
Andrew Nicols [Fri, 28 Apr 2017 03:58:14 +0000 (11:58 +0800)]
MDL-58573 mod_assign: Whitespace fix
Andrew Nicols [Fri, 28 Apr 2017 03:46:02 +0000 (11:46 +0800)]
Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 28 Apr 2017 02:29:50 +0000 (10:29 +0800)]
Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Mon, 24 Apr 2017 08:06:48 +0000 (16:06 +0800)]
MDL-58573 mod_assign: Upgrade code for default gradingduedate
* Set default grading due date one week from the due date if:
- there is no grading due date set; and
- the assignment's due date is not older than 3 weeks from the
current date.
Marina Glancy [Thu, 27 Apr 2017 03:21:01 +0000 (11:21 +0800)]
MDL-58731 modules: display intro on the course page
something that was forgotten when adding _get_coursemodule_info to activities in MDL-58190
Dan Poltawski [Thu, 27 Apr 2017 17:35:28 +0000 (18:35 +0100)]
Merge branch 'wip-MDL-58689-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 27 Apr 2017 16:02:12 +0000 (17:02 +0100)]
Merge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github.com/marcusgreen/moodle
Juan Leyva [Thu, 27 Apr 2017 13:48:10 +0000 (15:48 +0200)]
MDL-58741 webservice: Add missing params to webservice/pluginfile.php
MDL-58334 and MDL-32471 introduced new parameters in pluginfile.php but
they are missing from webservice/pluginfile.php
We need the offline one in the Mobile app (this new parameter was
designed thinking in the mobile app)
Dan Poltawski [Thu, 27 Apr 2017 13:36:23 +0000 (14:36 +0100)]
Merge branch 'MDL-58722-master' of git://github.com/damyon/moodle
Cameron Ball [Thu, 27 Apr 2017 06:52:21 +0000 (14:52 +0800)]
MDL-58575 core_calendar: Group override tests for same priority
This patch adds tests for when group override events have the same
priority.
Damyon Wiese [Wed, 26 Apr 2017 02:22:17 +0000 (10:22 +0800)]
MDL-58722 mathjax: Update to 2.7.1 and remove a11y
2.7.1 bundles the accessibility and mchem extensions so we no longer need to bundle them and apply custom config.
Juan Leyva [Tue, 25 Apr 2017 20:25:50 +0000 (22:25 +0200)]
MDL-58720 course: Return restricted sections and modules in get_contents
core_course_get_contents was only checking for modules visible by the
user (via uservisible).
It was not checking for modules that are not visible for the user but
should be displayed in the course because they have access restrictions
configured.
Eloy Lafuente (stronk7) [Thu, 27 Apr 2017 07:55:45 +0000 (09:55 +0200)]
Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle
Cameron Ball [Thu, 27 Apr 2017 06:50:41 +0000 (14:50 +0800)]
MDL-58575 core_calendar: Properly restrict groups in event vault
Previously we were not filtering on groups in the event vault
which meant events for all groups would be returned regardless
of which user was passed in.
This resulted in situations where one student would group overrides
for groups they were not in.
David Monllao [Thu, 27 Apr 2017 07:16:27 +0000 (15:16 +0800)]
Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle
Cameron Ball [Thu, 20 Apr 2017 03:15:05 +0000 (11:15 +0800)]
MDL-58578 mod_assign: Correctly update user override priority
Since we now sort priority in ASC order, the top priority should be 0.
Cameron Ball [Thu, 13 Apr 2017 06:06:09 +0000 (14:06 +0800)]
MDL-58578 mod_quiz: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
Cameron Ball [Thu, 13 Apr 2017 05:38:25 +0000 (13:38 +0800)]
MDL-58578 mod_lesson: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
Cameron Ball [Thu, 13 Apr 2017 04:44:27 +0000 (12:44 +0800)]
MDL-58578 core_calendar: Properly respect priorities on overview
Prior to this patch, if a user was in two groups, and an override
existed for both groups in an assignment the override
visually lower on the override list would be displayed on the
overview, whereas the one visually higher would be displayed
in the assignment grading table.
Ryan Wyllie [Thu, 27 Apr 2017 07:00:03 +0000 (07:00 +0000)]
MDL-58557 mod_choice: only check responses if event is actionable
Marina Glancy [Thu, 27 Apr 2017 05:42:21 +0000 (13:42 +0800)]
MDL-58661 filepicker: correct size for alias icons
Andrew Nicols [Thu, 27 Apr 2017 05:55:02 +0000 (13:55 +0800)]
Merge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Mon, 24 Apr 2017 04:01:28 +0000 (09:31 +0530)]
MDL-58644 myoverview: Filter course summary before displaying.
Jake Dallimore [Thu, 27 Apr 2017 05:33:10 +0000 (13:33 +0800)]
Merge branch 'MDL-58701-master' of git://github.com/ankitagarwal/moodle
David Monllao [Thu, 27 Apr 2017 04:19:20 +0000 (12:19 +0800)]
Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 27 Apr 2017 04:11:29 +0000 (12:11 +0800)]
Merge branch 'MDL-58727-master' of git://github.com/jleyva/moodle
Ankit Agarwal [Wed, 26 Apr 2017 03:46:25 +0000 (09:16 +0530)]
MDL-58701 phpunit: Add tests for external_settings
Ankit Agarwal [Tue, 25 Apr 2017 07:16:46 +0000 (12:46 +0530)]
MDL-58701 libraries: Use pluginfile.php as rewrite url for web req.
David Monllao [Thu, 27 Apr 2017 04:07:21 +0000 (12:07 +0800)]
Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle
Marina Glancy [Thu, 27 Apr 2017 03:40:47 +0000 (11:40 +0800)]
MDL-58683 mod_data: fix behat in clean
In clean theme the behat step to add record to mod_data does not actually view the database
activity. In 3.3 the default value for completionview is 1 and it breaks the behat in Clean.