moodle.git
5 years agoMerge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle
David Monllao [Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)]
Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle

5 years agoMerge branch 'MDL-56737-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 7 Nov 2016 05:25:41 +0000 (13:25 +0800)]
Merge branch 'MDL-56737-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-56630-master' of git://github.com/damyon/moodle
David Monllao [Mon, 7 Nov 2016 05:15:03 +0000 (13:15 +0800)]
Merge branch 'MDL-56630-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-55215-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Mon, 7 Nov 2016 03:39:45 +0000 (11:39 +0800)]
Merge branch 'MDL-55215-master-fix1' of github.com/damyon/moodle

5 years agoMerge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 7 Nov 2016 03:15:58 +0000 (11:15 +0800)]
Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-55215 forms: Searchable selector was reindexing keys
Damyon Wiese [Mon, 7 Nov 2016 03:03:17 +0000 (11:03 +0800)]
MDL-55215 forms: Searchable selector was reindexing keys

5 years agoMerge branch 'MDL-56731_master' of https://github.com/tonynlin/moodle
David Monllao [Mon, 7 Nov 2016 02:44:32 +0000 (10:44 +0800)]
Merge branch 'MDL-56731_master' of https://github.com/tonynlin/moodle

5 years agoMDL-56630 theme_boost: Edit settings menu not always showing when it should
Damyon Wiese [Mon, 7 Nov 2016 02:44:19 +0000 (10:44 +0800)]
MDL-56630 theme_boost: Edit settings menu not always showing when it should

5 years agoMDL-56630 theme_boost: show blocks under content on small screens
Damyon Wiese [Mon, 31 Oct 2016 04:01:02 +0000 (12:01 +0800)]
MDL-56630 theme_boost: show blocks under content on small screens

This is tablet size and down.

5 years agoMerge branch 'MDL-56241-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)]
Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle

5 years agoMDL-56129 core: Change HTTP error code for iOS 10 video playback
Jonathon Fowler [Mon, 7 Nov 2016 01:55:11 +0000 (09:55 +0800)]
MDL-56129 core: Change HTTP error code for iOS 10 video playback

This patch changes the effective response code from a 407 to a 403 when
erroring on iOS 10 and when a HTTP_X_PLAYBACK_SESSION_ID HTTP header is
found.

This causes the iOS Media framework to send the cookie with the request
which subsequently succeeds.

5 years agoMDL-56241 boost: Wrap block footer in a div to emulate old layout
Damyon Wiese [Mon, 7 Nov 2016 01:51:39 +0000 (09:51 +0800)]
MDL-56241 boost: Wrap block footer in a div to emulate old layout

Some block styles are looking for .footer so we'll add it back.

5 years agoMerge branch 'MDL-55203' of https://github.com/mr-russ/moodle
David Monllao [Mon, 7 Nov 2016 01:49:33 +0000 (09:49 +0800)]
Merge branch 'MDL-55203' of https://github.com/mr-russ/moodle

5 years agoMDL-56241 theme_boost: add example context to block.mustache
Dan Poltawski [Thu, 3 Nov 2016 11:00:38 +0000 (11:00 +0000)]
MDL-56241 theme_boost: add example context to block.mustache

5 years agoMDL-56241 theme_boost: Add content class to blocks
Damyon Wiese [Mon, 31 Oct 2016 03:15:27 +0000 (11:15 +0800)]
MDL-56241 theme_boost: Add content class to blocks

Some of the plugin styles assume .content in the selectors.

5 years agoMDL-38158 media: missing require and videojs fallback
Marina Glancy [Mon, 7 Nov 2016 01:21:18 +0000 (09:21 +0800)]
MDL-38158 media: missing require and videojs fallback

Problems picked up by behat tests

5 years agoMDL-29795 mod_assign: Remove empty line
David Monllao [Mon, 7 Nov 2016 01:22:02 +0000 (09:22 +0800)]
MDL-29795 mod_assign: Remove empty line

5 years agoMerge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle
David Monllao [Mon, 7 Nov 2016 01:20:59 +0000 (09:20 +0800)]
Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle

5 years agoMDL-29795 behat: Narrow Edit link scope
David Monllao [Mon, 7 Nov 2016 01:18:07 +0000 (09:18 +0800)]
MDL-29795 behat: Narrow Edit link scope

5 years agoMDL-55215 forms: Rename searchableselector params
Andrew Nicols [Mon, 7 Nov 2016 01:06:40 +0000 (09:06 +0800)]
MDL-55215 forms: Rename searchableselector params

5 years agoMerge branch 'MDL-55215-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 7 Nov 2016 01:04:34 +0000 (09:04 +0800)]
Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle

5 years agoMDL-54751 course_modules: New major upgrade point
David Monllao [Mon, 7 Nov 2016 00:59:01 +0000 (08:59 +0800)]
MDL-54751 course_modules: New major upgrade point

Also trailing whitespace cleaned.

5 years agoMerge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle
David Monllao [Mon, 7 Nov 2016 00:55:44 +0000 (08:55 +0800)]
Merge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle

5 years agoMDL-55203 forms: Use correct admin folder name.
Russell Smith [Mon, 7 Nov 2016 00:15:34 +0000 (11:15 +1100)]
MDL-55203 forms: Use correct admin folder name.

When the admin folder if renamed, the system must replace that when
adding the competencies form elements to the QuickForm Library.

5 years agoMerge branch 'MDL-56149-master' of git://github.com/damyon/moodle
David Monllao [Sun, 6 Nov 2016 23:47:27 +0000 (07:47 +0800)]
Merge branch 'MDL-56149-master' of git://github.com/damyon/moodle

5 years agoMDL-54751 core_completion: Exclude activities pending deletion
Jake Dallimore [Fri, 4 Nov 2016 00:28:38 +0000 (08:28 +0800)]
MDL-54751 core_completion: Exclude activities pending deletion

5 years agoMDL-54751 behat: Support for adhoc module and section deletion in behat
Jake Dallimore [Wed, 2 Nov 2016 07:11:22 +0000 (15:11 +0800)]
MDL-54751 behat: Support for adhoc module and section deletion in behat

Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.

5 years agoMDL-54751 phpunit: Support adhoc module and section deletion in phpunit
Jake Dallimore [Wed, 2 Nov 2016 07:10:59 +0000 (15:10 +0800)]
MDL-54751 phpunit: Support adhoc module and section deletion in phpunit

Created a new phpunit util function run_all_adhoc_tasks which runs any
pending tasks, for use in unit tests. Added new recyclebin and course
unit tests covering the new functionality.

5 years agoMDL-54751 core_availability: Module restrictions exclude deletions
Jake Dallimore [Wed, 2 Nov 2016 07:09:44 +0000 (15:09 +0800)]
MDL-54751 core_availability: Module restrictions exclude deletions

To make sure users can't add an access restriction based on a
course module scheduled for deletion, or its respective grade items.

5 years agoMDL-54751 core_grades: Gradebook highlights modules pending deletion
Jake Dallimore [Wed, 2 Nov 2016 07:08:35 +0000 (15:08 +0800)]
MDL-54751 core_grades: Gradebook highlights modules pending deletion

Added warning to all gradebook pages if any modules are pending
deletion. Modified the return values for get_name, and is_locked for
affected grade items to indicate their pending deletion.

5 years agoMDL-54751 core_course: Edit course libs to support deletion flag
Jake Dallimore [Wed, 2 Nov 2016 07:07:55 +0000 (15:07 +0800)]
MDL-54751 core_course: Edit course libs to support deletion flag

Changed the course libs such that module and section deletion is now
handed off to relevant functions in the util class and exempted
modules scheduled for deletion from the course backups.

5 years agoMDL-54751 core_course: Create adhoc task for course module deletion
Jake Dallimore [Wed, 2 Nov 2016 07:06:40 +0000 (15:06 +0800)]
MDL-54751 core_course: Create adhoc task for course module deletion

5 years agoMDL-54751 core: introduce deletion flag for course modules
Jake Dallimore [Wed, 2 Nov 2016 07:05:56 +0000 (15:05 +0800)]
MDL-54751 core: introduce deletion flag for course modules

Created a flag, 'deletioninprogress' on the course_modules table to be
used when deleting course modules and course sections. Modified
modinfolib caches such that, when rebuilt, these caches hide the
relevant modules based on the value of the flag.

5 years agoMDL-38158 core_media: bump upgrade / version and fix filter test
Eloy Lafuente (stronk7) [Fri, 4 Nov 2016 16:14:24 +0000 (17:14 +0100)]
MDL-38158 core_media: bump upgrade / version and fix filter test

5 years agoMerge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Fri, 4 Nov 2016 16:10:52 +0000 (17:10 +0100)]
Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-56737 tool_mobile: Support private tokens in launch.php
Juan Leyva [Thu, 3 Nov 2016 19:13:47 +0000 (19:13 +0000)]
MDL-56737 tool_mobile: Support private tokens in launch.php

5 years agoMDL-56684 competencies: fix eslint probs in templates
Dan Poltawski [Fri, 4 Nov 2016 14:54:44 +0000 (14:54 +0000)]
MDL-56684 competencies: fix eslint probs in templates

5 years agoMDL-56684 competencies: Boost for competency templates
Damyon Wiese [Wed, 2 Nov 2016 08:38:33 +0000 (16:38 +0800)]
MDL-56684 competencies: Boost for competency templates

Add BS4 markup to all competencies templates. Also tweaked the template library to make it
easier in future when modifying templates and reloading.

5 years agoMerge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle
Dan Poltawski [Fri, 4 Nov 2016 14:31:00 +0000 (14:31 +0000)]
Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle

5 years agoMerge branch 'MDL-56668-m' of https://github.com/micaherne/moodle
Dan Poltawski [Fri, 4 Nov 2016 14:23:10 +0000 (14:23 +0000)]
Merge branch 'MDL-56668-m' of https://github.com/micaherne/moodle

5 years agoMerge branch 'MDL-56654-master' of git://github.com/damyon/moodle
Dan Poltawski [Fri, 4 Nov 2016 14:20:14 +0000 (14:20 +0000)]
Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56535-master' of git://github.com/jleyva/moodle
Dan Poltawski [Fri, 4 Nov 2016 14:10:48 +0000 (14:10 +0000)]
Merge branch 'MDL-56535-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-53945' of git://github.com/aolley/moodle
Dan Poltawski [Fri, 4 Nov 2016 14:07:26 +0000 (14:07 +0000)]
Merge branch 'MDL-53945' of git://github.com/aolley/moodle

5 years agoMDL-56731 groups: Fixes breadcrumb when returning to groups/index.php
Tony Lin [Thu, 3 Nov 2016 11:35:25 +0000 (11:35 +0000)]
MDL-56731 groups: Fixes breadcrumb when returning to groups/index.php

5 years agoon-demand release 3.2dev+
Dan Poltawski [Fri, 4 Nov 2016 11:20:34 +0000 (11:20 +0000)]
on-demand release 3.2dev+

5 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Fri, 4 Nov 2016 11:20:33 +0000 (11:20 +0000)]
NOBUG: Fixed file access permissions

5 years agoMerge branch 'MDL-56673-fix' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 4 Nov 2016 10:40:43 +0000 (11:40 +0100)]
Merge branch 'MDL-56673-fix' of git://github.com/danpoltawski/moodle

5 years agoMDL-56673 tool_templatelibrary: fix externallib backwards compat
Dan Poltawski [Fri, 4 Nov 2016 09:59:36 +0000 (09:59 +0000)]
MDL-56673 tool_templatelibrary: fix externallib backwards compat

The function now matches the VALUE_DEFAULT option of the service.

5 years agoMerge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 4 Nov 2016 10:11:32 +0000 (11:11 +0100)]
Merge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-38158 media_videojs: Add Video.JS player
Marina Glancy [Thu, 20 Oct 2016 08:11:47 +0000 (16:11 +0800)]
MDL-38158 media_videojs: Add Video.JS player

5 years agoMDL-38158 core_media: Convert media players to new plugin type
Marina Glancy [Thu, 15 Sep 2016 07:52:41 +0000 (15:52 +0800)]
MDL-38158 core_media: Convert media players to new plugin type

AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END

5 years agoMDL-38158 core_media: more correct semantic for html5 video audio tags
Marina Glancy [Wed, 14 Sep 2016 06:45:05 +0000 (14:45 +0800)]
MDL-38158 core_media: more correct semantic for html5 video audio tags

5 years agoMDL-55825 enrol_lti: Fix display of unenrol count on sync
Jun Pataleta [Fri, 4 Nov 2016 08:48:54 +0000 (16:48 +0800)]
MDL-55825 enrol_lti: Fix display of unenrol count on sync

5 years agoMDL-56740 geoip tests: update to a more reliable ipv6 location
Dan Poltawski [Fri, 4 Nov 2016 08:52:40 +0000 (08:52 +0000)]
MDL-56740 geoip tests: update to a more reliable ipv6 location

Hopefully. It's quite difficult for us to test this funcionality with
altering data sets. Hoping this UCLA v6 address will be more reliable.

5 years agoMerge branch 'MDL-46903-master-fix' of git://github.com/junpataleta/moodle
David Monllao [Fri, 4 Nov 2016 06:23:16 +0000 (14:23 +0800)]
Merge branch 'MDL-46903-master-fix' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-56673-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Fri, 4 Nov 2016 05:50:47 +0000 (13:50 +0800)]
Merge branch 'MDL-56673-master-fix1' of github.com/damyon/moodle

5 years agoMDL-46903 mod_scorm: Apply alias to compare text column
Jun Pataleta [Fri, 4 Nov 2016 05:32:24 +0000 (13:32 +0800)]
MDL-46903 mod_scorm: Apply alias to compare text column

5 years agoMDL-56748 cache: Removes cache definition instances in purge_store
Andrew Nicols [Fri, 4 Nov 2016 02:56:34 +0000 (10:56 +0800)]
MDL-56748 cache: Removes cache definition instances in purge_store

Previously a purge_store was only purging caches but it was leaving a
reference to the store instance for the cache definition.

As a result, the cache was never cleared away correctly and, in cases
where the cache store makes a TCP connection to a backend system, the
number of open sockets was increasing for each store instance.

After a complete purge, as found in the unit test reset, the cache
definitions should be both purged and removed.

This change should also lead to a drop in memory consumption for unit
tests as there will no longer be references to unused definition stores.

5 years agoMDL-56673 tool_templatelibrary: Don't show templates from other themes
Damyon Wiese [Fri, 4 Nov 2016 04:52:38 +0000 (12:52 +0800)]
MDL-56673 tool_templatelibrary: Don't show templates from other themes

5 years agoMerge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Fri, 4 Nov 2016 00:28:08 +0000 (08:28 +0800)]
Merge branch 'MDL-56576_master-fix' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle
David Monllao [Fri, 4 Nov 2016 00:24:43 +0000 (08:24 +0800)]
Merge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle

5 years agoMDL-56576 theme_boost: Add save-settings param to admin search
David Monllao [Fri, 4 Nov 2016 00:16:58 +0000 (08:16 +0800)]
MDL-56576 theme_boost: Add save-settings param to admin search

5 years agoMDL-53945 mnet: Use moodle_url to provide string with url
Adam Olley [Thu, 3 Nov 2016 22:40:30 +0000 (09:10 +1030)]
MDL-53945 mnet: Use moodle_url to provide string with url

Using moodle_url where possible is preferable to hardcoding uri's as
moodle_url is able to take care of alot of the formatting for us.

In this instance, it handles the $CFG->admin url path for us.

5 years agoMDL-56668 competencies: Correct namespacing of coding_exception
Michael Aherne [Thu, 3 Nov 2016 13:59:13 +0000 (13:59 +0000)]
MDL-56668 competencies: Correct namespacing of coding_exception

5 years agoMerge branch 'MDL-56576-master' of git://github.com/damyon/moodle
David Monllao [Thu, 3 Nov 2016 07:14:41 +0000 (15:14 +0800)]
Merge branch 'MDL-56576-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56641-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 3 Nov 2016 06:58:26 +0000 (14:58 +0800)]
Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Thu, 3 Nov 2016 06:56:32 +0000 (14:56 +0800)]
Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-56481-master' of git://github.com/junpataleta/moodle
David Monllao [Thu, 3 Nov 2016 06:51:51 +0000 (14:51 +0800)]
Merge branch 'MDL-56481-master' of git://github.com/junpataleta/moodle

5 years agoMDL-56677 cohort: Fix cohort search box misalignment
David Monllao [Thu, 3 Nov 2016 06:20:25 +0000 (14:20 +0800)]
MDL-56677 cohort: Fix cohort search box misalignment

5 years agoMDL-56481 tool_lpmigrate: Fix notice when cancelling framework migration
Tim Lock [Wed, 19 Oct 2016 01:41:14 +0000 (12:11 +1030)]
MDL-56481 tool_lpmigrate: Fix notice when cancelling framework migration

5 years agoMerge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Thu, 3 Nov 2016 06:08:21 +0000 (14:08 +0800)]
Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-56666-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 3 Nov 2016 02:28:59 +0000 (10:28 +0800)]
Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle

5 years agoMDL-56576 admin: Cannot edit blocks on search page
Damyon Wiese [Mon, 31 Oct 2016 14:49:39 +0000 (22:49 +0800)]
MDL-56576 admin: Cannot edit blocks on search page

Admin search page was processing the blocks delete request before the blocks
could process it.

Added a hidden field to the search results form so it can be sure the form submission
was for saving admin settings.

5 years agoMDL-56641 admin: Managers can access search page
Damyon Wiese [Mon, 31 Oct 2016 05:39:34 +0000 (13:39 +0800)]
MDL-56641 admin: Managers can access search page

5 years agoMDL-56654 blogs: Display RSS link in the page
Damyon Wiese [Thu, 3 Nov 2016 01:22:04 +0000 (09:22 +0800)]
MDL-56654 blogs: Display RSS link in the page

5 years agoMDL-53945 mnet: replace hardcoded admin dir with cfg
Adam Olley [Thu, 3 Nov 2016 00:05:37 +0000 (10:35 +1030)]
MDL-53945 mnet: replace hardcoded admin dir with cfg

Several places in admin/mnet pull in required files using a hardcoded
admin dir string, as this is configurable it needs to use $CFG->admin
instead.

Places where the url is passed through moodle_url don't need to be
updated as that already automatically translates the urls for us.

5 years agoMerge branch 'MDL-56691-master' of git://github.com/damyon/moodle
David Monllao [Thu, 3 Nov 2016 00:22:25 +0000 (08:22 +0800)]
Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle

5 years agoMDL-54986 Quiz: Disable add button for quiz with attempts
John Beedell [Wed, 2 Nov 2016 17:02:59 +0000 (17:02 +0000)]
MDL-54986 Quiz: Disable add button for quiz with attempts

5 years agoMerge branch 'MDL-55841-master' of https://github.com/xow/moodle
Dan Poltawski [Wed, 2 Nov 2016 15:24:33 +0000 (15:24 +0000)]
Merge branch 'MDL-55841-master' of https://github.com/xow/moodle

5 years agoMerge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada...
Dan Poltawski [Wed, 2 Nov 2016 15:14:46 +0000 (15:14 +0000)]
Merge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada/moodle

5 years agoMerge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 2 Nov 2016 14:41:10 +0000 (14:41 +0000)]
Merge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 2 Nov 2016 13:58:53 +0000 (13:58 +0000)]
Merge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle

5 years agoMDL-56637 version: bump
Dan Poltawski [Wed, 2 Nov 2016 13:56:46 +0000 (13:56 +0000)]
MDL-56637 version: bump

5 years agoMerge branch 'MDL-56637-master' of git://github.com/dpalou/moodle
Dan Poltawski [Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)]
Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle

5 years agoMDL-56582 boost: add some misisng template context
Dan Poltawski [Wed, 2 Nov 2016 13:55:05 +0000 (13:55 +0000)]
MDL-56582 boost: add some misisng template context

5 years agoMerge branch 'MDL-56582-master' of https://github.com/xow/moodle
Dan Poltawski [Wed, 2 Nov 2016 13:49:50 +0000 (13:49 +0000)]
Merge branch 'MDL-56582-master' of https://github.com/xow/moodle

5 years agoMDL-56666 message: New WS core_message_get_user_message_preferences
Juan Leyva [Tue, 1 Nov 2016 14:25:51 +0000 (14:25 +0000)]
MDL-56666 message: New WS core_message_get_user_message_preferences

5 years agoMDL-56161 boost: fix confict resolution mistake
Dan Poltawski [Wed, 2 Nov 2016 10:20:34 +0000 (10:20 +0000)]
MDL-56161 boost: fix confict resolution mistake

5 years agoMDL-56161 boost: add missing example context
Dan Poltawski [Wed, 2 Nov 2016 10:14:00 +0000 (10:14 +0000)]
MDL-56161 boost: add missing example context

5 years agoMerge branch 'MDL-56161-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 2 Nov 2016 09:36:09 +0000 (09:36 +0000)]
Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56433-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 2 Nov 2016 09:33:28 +0000 (09:33 +0000)]
Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56621-master-fix' of http://github.com/damyon/moodle
Dan Poltawski [Wed, 2 Nov 2016 09:03:05 +0000 (09:03 +0000)]
Merge branch 'MDL-56621-master-fix' of github.com/damyon/moodle

5 years agoMDL-56582 theme_boost: Insert a proxy div for settings menu
Damyon Wiese [Thu, 27 Oct 2016 06:28:27 +0000 (14:28 +0800)]
MDL-56582 theme_boost: Insert a proxy div for settings menu

This forces text in the page to wrap around the settings cog. Also
notifications background color goes underneath the div for the
settings cog - so we give it a background color.

5 years agoMerge branch 'MDL-56698-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 2 Nov 2016 07:34:06 +0000 (15:34 +0800)]
Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle

5 years agoMDL-56698 mod_feedback: Make it look ok in boost
Damyon Wiese [Wed, 2 Nov 2016 06:01:54 +0000 (14:01 +0800)]
MDL-56698 mod_feedback: Make it look ok in boost

5 years agoMDL-56671 mod_scorm: fix styling issues on scorm module
Simey Lameze [Tue, 1 Nov 2016 03:53:49 +0000 (11:53 +0800)]
MDL-56671 mod_scorm: fix styling issues on scorm module

5 years agoMerge branch 'MDL-56677-master' of git://github.com/lameze/moodle
David Monllao [Wed, 2 Nov 2016 06:55:00 +0000 (14:55 +0800)]
Merge branch 'MDL-56677-master' of git://github.com/lameze/moodle

5 years agoMDL-56621 forms: Give a default value if format not set
Damyon Wiese [Wed, 2 Nov 2016 06:38:27 +0000 (14:38 +0800)]
MDL-56621 forms: Give a default value if format not set

For forms with a text area, we need to provide a default for the format.
This only affects boost because it is export_for_template.

5 years agoMerge branch 'wip-mdl-56273' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 2 Nov 2016 06:30:08 +0000 (14:30 +0800)]
Merge branch 'wip-mdl-56273' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56273 cache: Fixed initialise call
Rajesh Taneja [Wed, 2 Nov 2016 06:04:22 +0000 (14:04 +0800)]
MDL-56273 cache: Fixed initialise call

After store is created, it should be checked if
it's ready before calling initialise