moodle.git
6 years agoMDL-58794 core_course: Use a simpler future timestamp for test
Jun Pataleta [Wed, 3 May 2017 02:55:54 +0000 (10:55 +0800)]
MDL-58794 core_course: Use a simpler future timestamp for test

6 years agoon-demand release 3.3beta+
David Monllao [Wed, 3 May 2017 02:28:52 +0000 (10:28 +0800)]
on-demand release 3.3beta+

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

6 years agoMDL-58746 core: Simplify environment check
Andrew Nicols [Wed, 3 May 2017 00:32:04 +0000 (08:32 +0800)]
MDL-58746 core: Simplify environment check

6 years agoAutomatically generated installer lang files
AMOS bot [Tue, 2 May 2017 16:05:36 +0000 (00:05 +0800)]
Automatically generated installer lang files

6 years agoMerge branch 'MDL-57704-master' of https://github.com/xow/moodle
Andrew Nicols [Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)]
Merge branch 'MDL-57704-master' of https://github.com/xow/moodle

6 years agoMDL-57704 ltiprovider: Don't force SSLv3
John Okely [Tue, 2 May 2017 01:11:23 +0000 (09:11 +0800)]
MDL-57704 ltiprovider: Don't force SSLv3

6 years agoMerge branch 'wip-MDL-58665-master' of git://github.com/marinaglancy/moodle
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

6 years agoMDL-55468 mod_feedback: revive export analysis to excel
Marina Glancy [Thu, 6 Apr 2017 03:40:31 +0000 (11:40 +0800)]
MDL-55468 mod_feedback: revive export analysis to excel

6 years agoMerge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle
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

6 years agoMDL-58665 dashboard: use bigger course object for completion
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

6 years agoMDL-58665 mod_scorm: cache times in modinfo for performance
Marina Glancy [Fri, 28 Apr 2017 02:35:29 +0000 (10:35 +0800)]
MDL-58665 mod_scorm: cache times in modinfo for performance

6 years agoMerge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Mon, 1 May 2017 07:22:53 +0000 (15:22 +0800)]
Merge branch 'MDL-58732-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-58167-master' of git://github.com/lameze/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

6 years agoMerge branch 'MDL-58632-master' of https://github.com/xow/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

6 years agoMerge branch 'MDL-58746-master' of git://github.com/andrewnicols/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

6 years agoMDL-58665 mod_data: cache times in modinfo for performance
Marina Glancy [Fri, 28 Apr 2017 02:35:14 +0000 (10:35 +0800)]
MDL-58665 mod_data: cache times in modinfo for performance

6 years agoMDL-58665 mod_choice: cache choice time 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

6 years agoMDL-58665 mod_feedback: avoid extra db queries on dashboard
Marina Glancy [Fri, 21 Apr 2017 04:39:53 +0000 (12:39 +0800)]
MDL-58665 mod_feedback: avoid extra db queries on dashboard

6 years agoMerge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle
Jake Dallimore [Mon, 1 May 2017 04:14:42 +0000 (12:14 +0800)]
Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-58720-master' of git://github.com/jleyva/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

6 years agoMDL-58732 block_myoverview: fix course view event groupings
Ryan Wyllie [Mon, 1 May 2017 02:18:57 +0000 (02:18 +0000)]
MDL-58732 block_myoverview: fix course view event groupings

6 years agoMDL-58732 block_myoverview: improve style of empty course palceholder
Ryan Wyllie [Mon, 1 May 2017 02:17:47 +0000 (02:17 +0000)]
MDL-58732 block_myoverview: improve style of empty course palceholder

6 years agoMDL-58732 block_myoverview: add max-width to block content
Ryan Wyllie [Mon, 1 May 2017 02:15:41 +0000 (02:15 +0000)]
MDL-58732 block_myoverview: add max-width to block content

6 years agoMDL-58167 theme: update accessibility templates on clean
Simey Lameze [Mon, 1 May 2017 01:30:38 +0000 (09:30 +0800)]
MDL-58167 theme: update accessibility templates on clean

6 years agoMDL-58167 block_myoverview: improve block accessibility
Simey Lameze [Thu, 27 Apr 2017 06:06:36 +0000 (14:06 +0800)]
MDL-58167 block_myoverview: improve block accessibility

6 years agoMDL-58746 core: Add environment check for finfo
Andrew Nicols [Mon, 1 May 2017 00:51:37 +0000 (08:51 +0800)]
MDL-58746 core: Add environment check for finfo

6 years agoMDL-58760 templates: Fix the template context documentation
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.

6 years agoMDL-58760 templates: Make {{#pix}} helper work with escaped icon key
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.

6 years agoon-demand release 3.3beta+
Dan Poltawski [Fri, 28 Apr 2017 11:36:29 +0000 (12:36 +0100)]
on-demand release 3.3beta+

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

6 years agoMerge branch 'MDL-58643-master' of git://github.com/snake/moodle
Dan Poltawski [Fri, 28 Apr 2017 08:44:35 +0000 (09:44 +0100)]
Merge branch 'MDL-58643-master' of git://github.com/snake/moodle

6 years agoMDL-58643 behat: ensure results are in first page + multi suite fix.
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.

6 years agoMerge branch 'MDL-58741-master' of git://github.com/jleyva/moodle
Jun Pataleta [Fri, 28 Apr 2017 03:59:47 +0000 (11:59 +0800)]
Merge branch 'MDL-58741-master' of git://github.com/jleyva/moodle

6 years agoMDL-58573 mod_assign: Whitespace fix
Andrew Nicols [Fri, 28 Apr 2017 03:58:14 +0000 (11:58 +0800)]
MDL-58573 mod_assign: Whitespace fix

6 years agoMerge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 28 Apr 2017 03:46:02 +0000 (11:46 +0800)]
Merge branch 'MDL-58573-master' of git://github.com/junpataleta/moodle

6 years agoMerge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/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

6 years agoMDL-58573 mod_assign: Upgrade code for default gradingduedate
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.

6 years agoMDL-58731 modules: display intro on the course page
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

6 years agoMerge branch 'wip-MDL-58689-master' of git://github.com/marinaglancy/moodle
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

6 years agoMerge branch 'wip-MDL-58671-double-escaping-in-course-overview' of https://github...
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

6 years agoMDL-58741 webservice: Add missing params to webservice/pluginfile.php
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)

6 years agoMerge branch 'MDL-58722-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 27 Apr 2017 13:36:23 +0000 (14:36 +0100)]
Merge branch 'MDL-58722-master' of git://github.com/damyon/moodle

6 years agoMDL-58575 core_calendar: Group override tests for same priority
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.

6 years agoMDL-58722 mathjax: Update to 2.7.1 and remove a11y
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.

6 years agoMDL-58720 course: Return restricted sections and modules in get_contents
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.

6 years agoMerge branch 'wip-MDL-58683-master' of git://github.com/marinaglancy/moodle
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

6 years agoMDL-58575 core_calendar: Properly restrict groups in event vault
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.

6 years agoMerge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle
David Monllao [Thu, 27 Apr 2017 07:16:27 +0000 (15:16 +0800)]
Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle

6 years agoMDL-58578 mod_assign: Correctly update user override priority
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.

6 years agoMDL-58578 mod_quiz: Correctly provide group override priorities
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.

6 years agoMDL-58578 mod_lesson: Correctly provide group override priorities
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.

6 years agoMDL-58578 core_calendar: Properly respect priorities on overview
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.

6 years agoMDL-58557 mod_choice: only check responses if event is actionable
Ryan Wyllie [Thu, 27 Apr 2017 07:00:03 +0000 (07:00 +0000)]
MDL-58557 mod_choice: only check responses if event is actionable

6 years agoMerge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Thu, 27 Apr 2017 05:55:02 +0000 (13:55 +0800)]
Merge branch 'MDL-58644-master' of git://github.com/ankitagarwal/moodle

6 years agoMDL-58644 myoverview: Filter course summary before displaying.
Ankit Agarwal [Mon, 24 Apr 2017 04:01:28 +0000 (09:31 +0530)]
MDL-58644 myoverview: Filter course summary before displaying.

6 years agoMerge branch 'MDL-58701-master' of git://github.com/ankitagarwal/moodle
Jake Dallimore [Thu, 27 Apr 2017 05:33:10 +0000 (13:33 +0800)]
Merge branch 'MDL-58701-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-58628-master' of git://github.com/jleyva/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

6 years agoMerge branch 'MDL-58727-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

6 years agoMDL-58701 phpunit: Add tests for external_settings
Ankit Agarwal [Wed, 26 Apr 2017 03:46:25 +0000 (09:16 +0530)]
MDL-58701 phpunit: Add tests for external_settings

6 years agoMDL-58701 libraries: Use pluginfile.php as rewrite url for web req.
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.

6 years agoMerge branch 'MDL-58708-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 27 Apr 2017 04:07:21 +0000 (12:07 +0800)]
Merge branch 'MDL-58708-master' of git://github.com/jleyva/moodle

6 years agoMDL-58683 mod_data: fix behat in clean
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.

6 years agoMerge branch 'MDL-58557-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 27 Apr 2017 03:36:26 +0000 (11:36 +0800)]
Merge branch 'MDL-58557-master' of git://github.com/ryanwyllie/moodle

6 years agoMerge branch 'MDL-58698-master-strlang' of git://github.com/mudrd8mz/moodle
David Monllao [Thu, 27 Apr 2017 03:34:47 +0000 (11:34 +0800)]
Merge branch 'MDL-58698-master-strlang' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'wip-MDL-57807-master' of git://github.com/abgreeve/moodle
David Monllao [Thu, 27 Apr 2017 03:33:27 +0000 (11:33 +0800)]
Merge branch 'wip-MDL-57807-master' of git://github.com/abgreeve/moodle

6 years agoMerge branch 'MDL-58372-master' of git://github.com/Dagefoerde/moodle
David Monllao [Thu, 27 Apr 2017 03:31:31 +0000 (11:31 +0800)]
Merge branch 'MDL-58372-master' of git://github.com/Dagefoerde/moodle

6 years agoMerge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Thu, 27 Apr 2017 03:25:35 +0000 (11:25 +0800)]
Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-54849-master' of git://github.com/damyon/moodle
David Monllao [Thu, 27 Apr 2017 03:20:02 +0000 (11:20 +0800)]
Merge branch 'MDL-54849-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-58718-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 27 Apr 2017 03:14:04 +0000 (11:14 +0800)]
Merge branch 'MDL-58718-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-58689 dml: prevent logging during setup
Marina Glancy [Thu, 27 Apr 2017 01:39:36 +0000 (09:39 +0800)]
MDL-58689 dml: prevent logging during setup

6 years agoMDL-57807 mod_data: Advanced search with menu item.
Adrian Greeve [Wed, 26 Apr 2017 05:36:53 +0000 (13:36 +0800)]
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.

6 years agoMDL-58698 js: Fix the detection of the moodle language
David Mudrák [Wed, 26 Apr 2017 08:14:50 +0000 (10:14 +0200)]
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.

6 years agoAutomatically generated installer lang files
AMOS bot [Wed, 26 Apr 2017 16:05:04 +0000 (00:05 +0800)]
Automatically generated installer lang files

6 years agoMDL-58708 mod_lesson: Fix notice in lesson
Juan Leyva [Wed, 26 Apr 2017 14:05:25 +0000 (16:05 +0200)]
MDL-58708 mod_lesson: Fix notice in lesson

The notice was displayed only when accesing restored Moodle 1.X lessons.

6 years agoMDL-58372 repository_webdav: Explicitly pass some filename
Jan Dageförde [Wed, 26 Apr 2017 08:44:52 +0000 (10:44 +0200)]
MDL-58372 repository_webdav: Explicitly pass some filename

Not passing anything triggers PHP 7.1 "Too few arguments" exception.

6 years agoMDL-58727 tool_mobile: Return always launcher in get_public_config WS
Juan Leyva [Wed, 26 Apr 2017 07:26:13 +0000 (09:26 +0200)]
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.

6 years agoon-demand release 3.3beta+
Jake Dallimore [Wed, 26 Apr 2017 06:49:49 +0000 (14:49 +0800)]
on-demand release 3.3beta+

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jake Dallimore [Wed, 26 Apr 2017 06:49:48 +0000 (14:49 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-58668-master' of git://github.com/jleyva/moodle
Jun Pataleta [Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)]
Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle

6 years agoMDL-58557 mod_choice: change action event callback logic
Ryan Wyllie [Fri, 21 Apr 2017 02:07:39 +0000 (02:07 +0000)]
MDL-58557 mod_choice: change action event callback logic

6 years agoMDL-58718 filestorage: Normalise file paths for Windows
Andrew Nicols [Wed, 26 Apr 2017 01:35:19 +0000 (09:35 +0800)]
MDL-58718 filestorage: Normalise file paths for Windows

6 years agoMDL-58718 unit tests: fix some windows + 32bits problems
Eloy Lafuente (stronk7) [Tue, 25 Apr 2017 18:21:48 +0000 (20:21 +0200)]
MDL-58718 unit tests: fix some windows + 32bits problems

- We were using number beyond 32 bits MAXINT.
- setTimestamp() needs an integer. Better fulfill it.

6 years agoMDL-58632 assignsubmission_file: Don't allow any extension
John Okely [Wed, 19 Apr 2017 07:07:31 +0000 (15:07 +0800)]
MDL-58632 assignsubmission_file: Don't allow any extension

6 years agoMDL-58671 blocks: double-escaping-in-course-overview
Marcus Green [Tue, 25 Apr 2017 14:40:35 +0000 (15:40 +0100)]
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.

6 years agoMDL-58668 mod_lesson: Fix how multi answers are processed
Juan Leyva [Fri, 21 Apr 2017 09:26:43 +0000 (11:26 +0200)]
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.

6 years agoMerge branch 'MDL-58556-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)]
Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle

6 years agoMDL-58691 exporter: Filters should always apply for web pages
Ankit Agarwal [Mon, 24 Apr 2017 06:17:29 +0000 (11:47 +0530)]
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

6 years agoMerge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle
Jake Dallimore [Mon, 24 Apr 2017 07:16:30 +0000 (15:16 +0800)]
Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle

6 years agoMDL-58556 auth: better expired password
Damyon Wiese [Fri, 21 Apr 2017 05:27:35 +0000 (13:27 +0800)]
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.

6 years agoMDL-54849 lesson: Move on to next question
Damyon Wiese [Mon, 24 Apr 2017 06:06:57 +0000 (14:06 +0800)]
MDL-54849 lesson: Move on to next question

Move on to next question button takes you to the same question again.

6 years agoMerge branch 'MDL-58659-master' of git://github.com/jleyva/moodle
Jake Dallimore [Mon, 24 Apr 2017 04:02:20 +0000 (12:02 +0800)]
Merge branch 'MDL-58659-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-MDL-58666-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 24 Apr 2017 03:47:56 +0000 (11:47 +0800)]
Merge branch 'wip-MDL-58666-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-58600-master' of git://github.com/ankitagarwal/moodle
Jun Pataleta [Mon, 24 Apr 2017 03:09:33 +0000 (11:09 +0800)]
Merge branch 'MDL-58600-master' of git://github.com/ankitagarwal/moodle

6 years agoMDL-58600 competencies: Use correct formating api in exporter
Ankit Agarwal [Wed, 19 Apr 2017 05:45:54 +0000 (11:15 +0530)]
MDL-58600 competencies: Use correct formating api in exporter

6 years agoMerge branch 'MDL-58681' of git://github.com/stronk7/moodle
Jun Pataleta [Mon, 24 Apr 2017 02:24:33 +0000 (10:24 +0800)]
Merge branch 'MDL-58681' of git://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-58586-master' of git://github.com/damyon/moodle
Jun Pataleta [Mon, 24 Apr 2017 01:33:12 +0000 (09:33 +0800)]
Merge branch 'MDL-58586-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-51932-master-workshopswitch' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Mon, 24 Apr 2017 00:34:06 +0000 (08:34 +0800)]
Merge branch 'MDL-51932-master-workshopswitch' of git://github.com/mudrd8mz/moodle

6 years agoMDL-58681 behat: Split checkbox and advcheckbox tests
Eloy Lafuente (stronk7) [Sun, 23 Apr 2017 16:13:02 +0000 (18:13 +0200)]
MDL-58681 behat: Split checkbox and advcheckbox tests

MDL-58267 converted "Display description on course page" to advcheckbox
(see 7f53e8aa22d555ba5f94530b7fc04a4e95f35c98).

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.

6 years agoAutomatically generated installer lang files
AMOS bot [Sat, 22 Apr 2017 16:04:01 +0000 (00:04 +0800)]
Automatically generated installer lang files