Ryan Wyllie [Thu, 27 Apr 2017 07:00:03 +0000 (07:00 +0000)]
MDL-58557 mod_choice: only check responses if event is actionable
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
David Monllao [Thu, 27 Apr 2017 03:36:26 +0000 (11:36 +0800)]
Merge branch 'MDL-58557-master' of git://github.com/ryanwyllie/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
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
David Monllao [Thu, 27 Apr 2017 03:31:31 +0000 (11:31 +0800)]
Merge branch 'MDL-58372-master' of git://github.com/Dagefoerde/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
David Monllao [Thu, 27 Apr 2017 03:20:02 +0000 (11:20 +0800)]
Merge branch 'MDL-54849-master' of git://github.com/damyon/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
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.
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.
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.
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.
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.
Jake Dallimore [Wed, 26 Apr 2017 06:49:49 +0000 (14:49 +0800)]
on-demand release 3.3beta+
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
Jun Pataleta [Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)]
Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle
Ryan Wyllie [Fri, 21 Apr 2017 02:07:39 +0000 (02:07 +0000)]
MDL-58557 mod_choice: change action event callback logic
Andrew Nicols [Wed, 26 Apr 2017 01:35:19 +0000 (09:35 +0800)]
MDL-58718 filestorage: Normalise file paths for Windows
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.
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.
Dan Poltawski [Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)]
Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle
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
Jake Dallimore [Mon, 24 Apr 2017 07:16:30 +0000 (15:16 +0800)]
Merge branch 'MDL-57793-master' of git://github.com/junpataleta/moodle
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.
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.
Jake Dallimore [Mon, 24 Apr 2017 04:02:20 +0000 (12:02 +0800)]
Merge branch 'MDL-58659-master' of git://github.com/jleyva/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
Jun Pataleta [Mon, 24 Apr 2017 03:09:33 +0000 (11:09 +0800)]
Merge branch 'MDL-58600-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 19 Apr 2017 05:45:54 +0000 (11:15 +0530)]
MDL-58600 competencies: Use correct formating api in exporter
Jun Pataleta [Mon, 24 Apr 2017 02:24:33 +0000 (10:24 +0800)]
Merge branch 'MDL-58681' of git://github.com/stronk7/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
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
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.
AMOS bot [Sat, 22 Apr 2017 16:04:01 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 21 Apr 2017 14:48:31 +0000 (15:48 +0100)]
Moodle release 3.3beta
Dan Poltawski [Fri, 21 Apr 2017 14:48:28 +0000 (15:48 +0100)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Fri, 21 Apr 2017 14:48:27 +0000 (15:48 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 21 Apr 2017 14:37:51 +0000 (15:37 +0100)]
Merge branch 'MDL-58138-master-bulkcompletefix' of https://github.com/mudrd8mz/moodle
David Mudrák [Fri, 21 Apr 2017 14:22:50 +0000 (16:22 +0200)]
MDL-58138 completion: Fix capability required for setting defaults
As per core_completion\manager::get_available_completion_tabs() the
required capability for this feature is moodle/course:manageactivities,
not moodle/course:update.
Dan Poltawski [Fri, 21 Apr 2017 08:04:43 +0000 (09:04 +0100)]
Merge branch 'wip-MDL-58138-fix2' of https://github.com/marinaglancy/moodle
Marina Glancy [Fri, 21 Apr 2017 07:01:32 +0000 (15:01 +0800)]
MDL-58138 completion: manual completion may have expected date
David Monllao [Fri, 21 Apr 2017 06:30:52 +0000 (14:30 +0800)]
Merge branch 'MDL-58621-master-fix' of git://github.com/lameze/moodle
Simey Lameze [Fri, 21 Apr 2017 05:09:06 +0000 (13:09 +0800)]
MDL-58621 block_myoverview: remove behat steps checking dates
David Monllao [Fri, 21 Apr 2017 05:10:50 +0000 (13:10 +0800)]
Merge branch 'MDL-58349-int-fix-1' of github.com:ryanwyllie/moodle
Marina Glancy [Fri, 21 Apr 2017 05:00:28 +0000 (13:00 +0800)]
MDL-58666 course: add module name to cache
without it there will be an extra db read in get_array_of_activities() to retrieve it for each activity
Ryan Wyllie [Fri, 21 Apr 2017 04:45:48 +0000 (04:45 +0000)]
MDL-58349 mod_assign: text wrap for comment search while grading
Jun Pataleta [Fri, 21 Apr 2017 03:52:35 +0000 (11:52 +0800)]
Merge branch 'MDL-58566_master' of github.com:markn86/moodle
Damyon Wiese [Fri, 21 Apr 2017 03:38:32 +0000 (11:38 +0800)]
MDL-58586 css: add margin to userpictures
Boost has a right margin on the userpicture but this is missing in bootstrapbase (it is
added only on random pages).
Add a margin to bootstrapbase so it matches boost.
Jun Pataleta [Fri, 21 Apr 2017 03:37:57 +0000 (11:37 +0800)]
Merge branch 'MDL-58636-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Fri, 21 Apr 2017 03:27:14 +0000 (11:27 +0800)]
MDL-58566 calendar: fixed comment's reference to non-existent function
Andrew Nicols [Wed, 19 Apr 2017 02:35:37 +0000 (10:35 +0800)]
MDL-58636 course: Ensure that the drag constraint has height
Andrew Nicols [Fri, 21 Apr 2017 02:39:41 +0000 (10:39 +0800)]
Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle
Simey Lameze [Fri, 21 Apr 2017 02:33:36 +0000 (10:33 +0800)]
MDL-58490 block_myoverview: add missing completionlib include
Jake Dallimore [Fri, 21 Apr 2017 02:26:00 +0000 (10:26 +0800)]
Merge branch 'MDL-58613-master-workshopfullname' of git://github.com/mudrd8mz/moodle
Marina Glancy [Fri, 21 Apr 2017 02:05:59 +0000 (10:05 +0800)]
MDL-57457 mod_book: Chapters are not userdata plus some improvements
Andrew Hancox [Wed, 19 Apr 2017 10:27:26 +0000 (11:27 +0100)]
MDL-57457 mod_book: Fix bug with edit form when tagging disabled
Andrew Hancox [Wed, 19 Apr 2017 08:38:31 +0000 (09:38 +0100)]
MDL-57457 mod_book: performance improvement for tags backup/restore
Andrew Hancox [Fri, 24 Mar 2017 15:34:45 +0000 (15:34 +0000)]
MDL-57457 mod_book: Implement tagging
David Monllao [Fri, 21 Apr 2017 02:03:59 +0000 (10:03 +0800)]
Merge branch 'MDL-58590' of https://github.com/sk-unikent/moodle
Jun Pataleta [Fri, 21 Apr 2017 01:04:32 +0000 (09:04 +0800)]
Merge branch 'MDL-58482-master' of git://github.com/lameze/moodle
Andrew Nicols [Fri, 21 Apr 2017 00:52:15 +0000 (08:52 +0800)]
Merge branch 'MDL-58490-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 19 Apr 2017 07:42:00 +0000 (15:42 +0800)]
MDL-58482 theme_boost: css fixes for view badge page
AMOS bot [Thu, 20 Apr 2017 16:09:48 +0000 (00:09 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 20 Apr 2017 12:14:00 +0000 (13:14 +0100)]
Merge branch 'MDL-58621-master' of git://github.com/ryanwyllie/moodle
Juan Leyva [Thu, 20 Apr 2017 10:54:33 +0000 (12:54 +0200)]
MDL-58659 enroll: Add start and end date fields required by overview
Those fields are required to display the courses overview for final
users.
Juan Leyva [Thu, 20 Apr 2017 10:53:10 +0000 (12:53 +0200)]
MDL-58659 course: Add missing enddate field in get_courses_by_field
Dan Poltawski [Thu, 20 Apr 2017 09:33:53 +0000 (10:33 +0100)]
Merge branch 'MDL-58426-master-bigicons' of git://github.com/mudrd8mz/moodle
David Mudrák [Mon, 17 Apr 2017 18:26:39 +0000 (20:26 +0200)]
MDL-58426 icons: Fix CSS for displaying big icons
The expected size of icons in the pix/b/ (big) folder was not respected
and they were displayed as 16x16 px.
Skylar Kelty [Thu, 13 Apr 2017 09:36:05 +0000 (10:36 +0100)]
MDL-58590 mobile: Cache mobile-supporting plugins
Jun Pataleta [Thu, 20 Apr 2017 08:11:31 +0000 (16:11 +0800)]
Merge branch 'MDL-58415-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)]
Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle
Juan Leyva [Wed, 19 Apr 2017 07:49:59 +0000 (09:49 +0200)]
MDL-58415 mod_lesson: Fix code styles and missing declaration
Found by the integrator review:
- Some incorrect code style declaration and phpdocs
- Missing $USER declaration
- Incorrect use of $lesson (should be $this)
Juan Leyva [Tue, 18 Apr 2017 08:33:39 +0000 (10:33 +0200)]
MDL-58415 mod_lesson: Add missing answer fields
There were a couple of fields missing when returning the complete
answer information required for offline usage.
Juan Leyva [Tue, 18 Apr 2017 08:28:38 +0000 (10:28 +0200)]
MDL-58415 mod_lesson: EOL var must be always numeric
Otherwise it will break the Web Service return description.
Juan Leyva [Thu, 6 Apr 2017 08:57:52 +0000 (10:57 +0200)]
MDL-58415 mod_lesson: Out of time should be a string
process_eol_page expects a string, right now we are passing a boolean.
We should convert it to the correct string when is set to true, that is
‘normal’
Juan Leyva [Thu, 30 Mar 2017 14:23:39 +0000 (16:23 +0200)]
MDL-58415 mod_lesson: Return always allowofflineattempts
We need this field always to be able to display if the lesson is
available or not for download
Juan Leyva [Tue, 28 Mar 2017 09:01:57 +0000 (11:01 +0200)]
MDL-58415 mod_lesson: Handle correctly review mode
Juan Leyva [Tue, 28 Mar 2017 08:58:52 +0000 (10:58 +0200)]
MDL-58415 mod_lesson: Avoid API http redirections
Deep in the lesson API there are some http redirections in special
pages like clusters.
We need to handle it via new parameters to avoid redirections.
Juan Leyva [Tue, 28 Mar 2017 08:22:09 +0000 (10:22 +0200)]
MDL-58415 mod_lesson: Force int type for calculated progress
Under some circumstances the value returned by the function needs
casting.
Dan Poltawski [Thu, 20 Apr 2017 07:26:54 +0000 (08:26 +0100)]
Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle
Mark Nelson [Thu, 20 Apr 2017 07:16:56 +0000 (15:16 +0800)]
MDL-58623 course: allow course summaries to be null in exporter
Andrew Nicols [Thu, 20 Apr 2017 07:23:50 +0000 (15:23 +0800)]
Merge branch 'MDL-58494-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 20 Apr 2017 07:17:59 +0000 (15:17 +0800)]
Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle
Jake Dallimore [Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)]
Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle
Simey Lameze [Thu, 20 Apr 2017 02:06:09 +0000 (10:06 +0800)]
MDL-58490 block_myoverview: separate course and activity completion
Dan Poltawski [Thu, 20 Apr 2017 06:44:56 +0000 (07:44 +0100)]
Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)]
Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 20 Apr 2017 06:19:17 +0000 (07:19 +0100)]
Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle
David Monllao [Thu, 20 Apr 2017 06:05:39 +0000 (14:05 +0800)]
Merge branch 'MDL-58278-master' of git://github.com/damyon/moodle
Simey Lameze [Thu, 20 Apr 2017 01:11:25 +0000 (09:11 +0800)]
MDL-58617 core_output: add mapping for dashboard on user menu
Andrew Nicols [Thu, 20 Apr 2017 05:54:43 +0000 (13:54 +0800)]
Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle
Mark Nelson [Thu, 20 Apr 2017 05:53:42 +0000 (13:53 +0800)]
MDL-58637 format_*: fixed incorrect CSS selector
