Commit graph

84275 commits

Author SHA1 Message Date
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
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
Juan Leyva
d5eefdb6a0 MDL-58668 mod_lesson: Fix how multi answers are processed
The module was choosing as incorrect the first possible incorrect
answer instead the first student incorrect answer.
In the patch I also refactored the foreach loop to avoid code
duplication.
2017-04-24 13:32:44 +02:00
Dan Poltawski
371482f881 Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle 2017-04-24 11:05:09 +01:00
Ankit Agarwal
34773ccf70 MDL-58691 exporter: Filters should always apply for web pages
The variables AJAX_SCIRPT, CLI_SCRIPT, WS_SERVER are always defined (and set to false)
when webpages are rendered, hence the check of 'defined' is invalid
2017-04-24 13:43:11 +05:30
Jake Dallimore
0dcfadd9e4 Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle 2017-04-24 15:16:30 +08:00
Damyon Wiese
44565f5cfc MDL-58556 auth: better expired password
If the auth plugin is using a custom url to change password - don't rely on forcepasswordchange
user preference being reset.
2017-04-24 15:08:39 +08:00
Damyon Wiese
ff8a1930ad MDL-54849 lesson: Move on to next question
Move on to next question button takes you to the same question again.
2017-04-24 14:06:57 +08:00
Jake Dallimore
4c7dc6af94 Merge branch 'MDL-58659-master' of git://github.com/jleyva/moodle 2017-04-24 12:02:20 +08:00
David Monllao
ac44bda247 Merge branch 'wip-MDL-58666-master' of git://github.com/marinaglancy/moodle 2017-04-24 11:47:56 +08:00
Jun Pataleta
e5eef6c545 Merge branch 'MDL-58600-master' of git://github.com/ankitagarwal/moodle 2017-04-24 11:09:33 +08:00
Ankit Agarwal
266d033896 MDL-58600 competencies: Use correct formating api in exporter 2017-04-24 08:31:13 +05:30
Jun Pataleta
a84e03ed69 Merge branch 'MDL-58681' of git://github.com/stronk7/moodle 2017-04-24 10:24:33 +08:00
Jun Pataleta
439616450e Merge branch 'MDL-58586-master' of git://github.com/damyon/moodle 2017-04-24 09:33:12 +08:00
Jun Pataleta
3e9c150d94 Merge branch 'MDL-51932-master-workshopswitch' of git://github.com/mudrd8mz/moodle 2017-04-24 08:34:06 +08:00
Eloy Lafuente (stronk7)
641d75bde6 MDL-58681 behat: Split checkbox and advcheckbox tests
MDL-58267 converted "Display description on course page" to advcheckbox
(see 7f53e8aa22).

Advanced checkboxes cannot be tested without real browser because Goutte
does not support the hidden+checkbox duality (MDL-55386).

So this patch does:

- Convert the NON-JS checks to use the "Force format" field (normal checkbox).
- Move the "Display description on course page" (adv. checkbox) to the JS scenario.
- Complete the 2 groups of checks above so the two ways to tick and untick are covered:
    - I set the field "xxxx" to "yyyy"
    - I set the following fields to these values:
- Complete the 2 groups of checks above so the two ways to verify the values are covered:
    - the field "xxxx" [matches|does not match] value "yyyy"
    - the following fields [match|do not match] these values:

That's all! The scenario is a bit spaghetti but it's way off the scope
of the issue to fix that.
2017-04-23 18:13:02 +02:00
AMOS bot
75ce4b4cfa Automatically generated installer lang files 2017-04-23 00:04:01 +08:00