Commit graph

84443 commits

Author SHA1 Message Date
Jun Pataleta
a43e85d5e4 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.
2017-04-28 10:28:35 +08:00
Marina Glancy
438c01d0dd MDL-58731 modules: display intro on the course page
something that was forgotten when adding _get_coursemodule_info to activities in MDL-58190
2017-04-28 09:14:25 +08:00
Dan Poltawski
baf3d04954 Merge branch 'wip-MDL-58689-master' of git://github.com/marinaglancy/moodle 2017-04-27 18:35:28 +01:00
Dan Poltawski
e6dd8f32f5 Merge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github.com/marcusgreen/moodle 2017-04-27 17:02:12 +01:00
Juan Leyva
a4727b81f6 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)
2017-04-27 17:04:01 +02:00
Juan Leyva
b44e4748d6 MDL-58709 registration: Fix incorrect setType 2017-04-27 16:57:45 +02:00
Dan Poltawski
3ee1817ea0 Merge branch 'MDL-58722-master' of git://github.com/damyon/moodle 2017-04-27 14:36:23 +01:00
Cameron Ball
d0dc97bf3a
MDL-58575 core_calendar: Group override tests for same priority
This patch adds tests for when group override events have the same
priority.
2017-04-27 19:12:50 +08:00
Damyon Wiese
51742ffdc4 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.
2017-04-27 16:57:03 +08:00
Juan Leyva
935429e2a5 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.
2017-04-27 10:53:17 +02:00
Eloy Lafuente (stronk7)
7a21720039 Merge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle 2017-04-27 09:55:45 +02:00
Cameron Ball
4bd022ed0c
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.
2017-04-27 15:23:53 +08:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00
Cameron Ball
30aa540fe7
MDL-58578 mod_assign: Correctly update user override priority
Since we now sort priority in ASC order, the top priority should be 0.
2017-04-27 15:15:12 +08:00
Cameron Ball
7eae70e167
MDL-58578 mod_quiz: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
2017-04-27 15:15:12 +08:00
Cameron Ball
756a132ff6
MDL-58578 mod_lesson: Correctly provide group override priorities
Previously the override priorities were being provided
back to front.
2017-04-27 15:15:12 +08:00
Cameron Ball
a776415d55
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.
2017-04-27 15:15:12 +08:00
Ryan Wyllie
a0499b7fff MDL-58557 mod_choice: only check responses if event is actionable 2017-04-27 07:00:03 +00:00
Marina Glancy
8559427687 MDL-58661 filepicker: correct size for alias icons 2017-04-27 14:40:13 +08:00
Andrew Nicols
ae068eb145 Merge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle 2017-04-27 13:55:02 +08:00
Ankit Agarwal
47820478b0 MDL-58644 myoverview: Filter course summary before displaying. 2017-04-27 11:22:03 +05:30
Jake Dallimore
ef35154953 Merge branch 'MDL-58701-master' of git://github.com/ankitagarwal/moodle 2017-04-27 13:33:10 +08:00
David Monllao
aabee00d58 Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle 2017-04-27 12:19:20 +08:00
David Monllao
0b90afb59e Merge branch 'MDL-58727-master' of git://github.com/jleyva/moodle 2017-04-27 12:11:29 +08:00
Ankit Agarwal
9743b2d4a9 MDL-58701 phpunit: Add tests for external_settings 2017-04-27 09:37:53 +05:30
Ankit Agarwal
1d772481dd MDL-58701 libraries: Use pluginfile.php as rewrite url for web req. 2017-04-27 09:37:53 +05:30
David Monllao
d40c8844a1 Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle 2017-04-27 12:07:21 +08:00
Marina Glancy
56236c7d86 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.
2017-04-27 11:40:47 +08:00
David Monllao
160c263da5 Merge branch 'MDL-58557-master' of git://github.com/ryanwyllie/moodle 2017-04-27 11:36:26 +08:00
David Monllao
8d12f5f2c0 Merge branch 'MDL-58698-master-strlang' of git://github.com/mudrd8mz/moodle 2017-04-27 11:34:47 +08:00
David Monllao
f944d2561f Merge branch 'wip-MDL-57807-master' of git://github.com/abgreeve/moodle 2017-04-27 11:33:27 +08:00
David Monllao
cab131a350 Merge branch 'MDL-58372-master' of git://github.com/Dagefoerde/moodle 2017-04-27 11:31:31 +08:00
Andrew Nicols
14ed05c0dc Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle 2017-04-27 11:25:35 +08:00
David Monllao
3e7d5a82b9 Merge branch 'MDL-54849-master' of git://github.com/damyon/moodle 2017-04-27 11:20:02 +08:00
David Monllao
f539dc3aa5 Merge branch 'MDL-58718-master' of git://github.com/andrewnicols/moodle 2017-04-27 11:14:04 +08:00
Marina Glancy
f2b5ed40f9 MDL-58689 dml: prevent logging during setup 2017-04-27 10:07:01 +08:00
Adrian Greeve
0a497898c5 MDL-57807 mod_data: Advanced search with menu item.
It is now possible to search other criteria without first
setting the menu items.

Thanks to Sergey Gorbatov for providing this patch.
2017-04-27 08:58:13 +08:00
David Mudrák
f387058839 MDL-58698 js: Fix the detection of the moodle language
This is the same problem that we had in MDL-52486. When the language
pack with multiple underscores (such as "en_us_k12") is selected, the
html root element's "lang" attribute is set to

    <html lang="en-us-12" ...>

which we then map back to the Moodle lang code using the JS function
replace().

What was missed in MDL-52486 was that when replacing a value (and not a
regular expression), only the first instance of the value is replaced.
So the value "en_us-k12" was sent as the lang parameter for the
core_string, which is invalid PARAM_LANG value and the exception was
thrown.

In case of the user_date.js, there was no actual problem experienced and
probably there is none as the language code is used as a cache key
rather than a PARAM_LANG parameter. But we are changing it too for
consistency.
2017-04-26 18:47:10 +02:00
AMOS bot
b80e9344e5 Automatically generated installer lang files 2017-04-27 00:05:04 +08:00
Juan Leyva
e7a11c20d6 MDL-58708 mod_lesson: Fix notice in lesson
The notice was displayed only when accesing restored Moodle 1.X lessons.
2017-04-26 16:05:25 +02:00
Jan Dageförde
c7de40a8ed
MDL-58372 repository_webdav: Explicitly pass some filename
Not passing anything triggers PHP 7.1 "Too few arguments" exception.
2017-04-26 11:28:41 +02:00
Juan Leyva
b103797868 MDL-58727 tool_mobile: Return always launcher in get_public_config WS
Recently we added support to the new OAuth SSO methods (Google,
Facebook, Microsoft) and identity providers, that will require
launchurl to be returned always by tool_mobile_get_public_config

It is safe to return always the launchurl, the main reason to not
return it was to reduce data returned by Web Services when was not
required.
2017-04-26 09:26:13 +02:00
Jake Dallimore
5ccddd27df on-demand release 3.3beta+ 2017-04-26 14:49:49 +08:00
Jake Dallimore
5e74acef0e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-04-26 14:49:48 +08:00
Jun Pataleta
abaf8106ea Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle 2017-04-26 11:06:30 +08:00
Ryan Wyllie
71cd51b8ff MDL-58557 mod_choice: change action event callback logic 2017-04-26 02:11:18 +00:00
Andrew Nicols
9020212522 MDL-58718 filestorage: Normalise file paths for Windows 2017-04-26 09:36:10 +08:00
Eloy Lafuente (stronk7)
a25116c0ac MDL-58718 unit tests: fix some windows + 32bits problems
- We were using number beyond 32 bits MAXINT.
- setTimestamp() needs an integer. Better fulfill it.
2017-04-26 09:36:10 +08:00
John Okely
d1076e3ef5 MDL-58632 assignsubmission_file: Don't allow any extension 2017-04-26 09:34:44 +08:00
Marcus Green
7283d0382e MDL-58671 blocks: double-escaping-in-course-overview
Added extra { } braces in mustache to prevent double escaping
which means they are now tripple braces.

Previously if a course name or item such as an assighment
had a character like &  it would show as &amp in the course
overview block.
2017-04-25 18:51:31 +01:00