moodle.git
5 years agoMerge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
Andrew Nicols [Thu, 17 Nov 2016 03:20:39 +0000 (11:20 +0800)]
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle

5 years agoMerge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle
David Monllao [Thu, 17 Nov 2016 02:42:08 +0000 (10:42 +0800)]
Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle

5 years agoMDL-52186 enrol_meta: Sync only active enrol_meta instances
Jun Pataleta [Wed, 16 Nov 2016 01:47:03 +0000 (09:47 +0800)]
MDL-52186 enrol_meta: Sync only active enrol_meta instances

Thanks to Peter Klinka for the solution!

5 years agoMerge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 17 Nov 2016 02:35:38 +0000 (10:35 +0800)]
Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 17 Nov 2016 02:32:00 +0000 (10:32 +0800)]
Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Thu, 17 Nov 2016 02:07:35 +0000 (10:07 +0800)]
Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56999-master' of git://github.com/damyon/moodle
David Monllao [Thu, 17 Nov 2016 01:31:07 +0000 (09:31 +0800)]
Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle

5 years agoMDL-56865 behat: Don't set error handler for behat install
Rajesh Taneja [Thu, 17 Nov 2016 00:56:54 +0000 (08:56 +0800)]
MDL-56865 behat: Don't set error handler for behat install

5 years agoMerge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 17 Nov 2016 00:51:47 +0000 (08:51 +0800)]
Merge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-56603 behat: Fixed search messages string to use id
Rajesh Taneja [Thu, 17 Nov 2016 00:46:32 +0000 (08:46 +0800)]
MDL-56603 behat: Fixed search messages string to use id

5 years agoMerge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 17 Nov 2016 00:38:24 +0000 (01:38 +0100)]
Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-56978 core: fix error handling in min_fix_utf8
Mark Nielsen [Wed, 16 Nov 2016 16:59:15 +0000 (08:59 -0800)]
MDL-56978 core: fix error handling in min_fix_utf8

Must completely suppress notice from iconv as Behat's
shutdown function uses error_get_last() which is
unable to detect if the error was suppressed or not.

5 years agoMerge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle
Dan Poltawski [Wed, 16 Nov 2016 13:03:38 +0000 (13:03 +0000)]
Merge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle

5 years agoMDL-56922 theme_boost: grey out activity icon when hidden
Dan Poltawski [Tue, 15 Nov 2016 12:31:37 +0000 (12:31 +0000)]
MDL-56922 theme_boost: grey out activity icon when hidden

This was present in bootstrapbase and is I think an important visual
distinction.

5 years agoMerge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle
David Monllao [Wed, 16 Nov 2016 11:38:08 +0000 (19:38 +0800)]
Merge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 10:29:01 +0000 (11:29 +0100)]
Merge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle

5 years agoMDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns
Frederic Massart [Wed, 16 Nov 2016 05:29:56 +0000 (13:29 +0800)]
MDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns

5 years agoMerge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 10:18:15 +0000 (11:18 +0100)]
Merge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 16 Nov 2016 10:08:10 +0000 (10:08 +0000)]
Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle

5 years agoMerge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 16 Nov 2016 09:46:10 +0000 (09:46 +0000)]
Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)]
Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle

5 years agoMerge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 16 Nov 2016 09:20:28 +0000 (09:20 +0000)]
Merge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-56915 webdav: Increase maximum expected header size
Frederic Massart [Wed, 16 Nov 2016 09:19:19 +0000 (17:19 +0800)]
MDL-56915 webdav: Increase maximum expected header size

5 years agoMDL-56889 boostrapbase: remove excessive stylelint-disables
Dan Poltawski [Wed, 16 Nov 2016 08:48:59 +0000 (08:48 +0000)]
MDL-56889 boostrapbase: remove excessive stylelint-disables

From bs4-compat.less, replace with file level disable instead.

5 years agoMDL-56889 bootstrapbase: create static bs4 compatible mixins
Simey Lameze [Wed, 16 Nov 2016 05:30:39 +0000 (13:30 +0800)]
MDL-56889 bootstrapbase: create static bs4 compatible mixins

5 years agoMDL-56767 block_login: Use btn-block as suggested by Andrew
Dan Poltawski [Wed, 16 Nov 2016 08:09:14 +0000 (08:09 +0000)]
MDL-56767 block_login: Use btn-block as suggested by Andrew

5 years agoMDL-56776 calendar: display month above the dates
Marina Glancy [Wed, 16 Nov 2016 07:46:56 +0000 (15:46 +0800)]
MDL-56776 calendar: display month above the dates

month is displayed in table caption which is by default in the bottom in BS4

5 years agoMerge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle
Andrew Nicols [Wed, 16 Nov 2016 07:36:37 +0000 (15:36 +0800)]
Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle

5 years agoMDL-56999 boost: Maintenance layout needs padding
Damyon Wiese [Wed, 16 Nov 2016 07:18:27 +0000 (15:18 +0800)]
MDL-56999 boost: Maintenance layout needs padding

5 years agoMDL-56603 message: Added see all link to message popup.
Adrian Greeve [Thu, 10 Nov 2016 04:24:50 +0000 (12:24 +0800)]
MDL-56603 message: Added see all link to message popup.

5 years agoMDL-56603 messaging: Add a new message link to popup.
Adrian Greeve [Wed, 16 Nov 2016 06:45:26 +0000 (14:45 +0800)]
MDL-56603 messaging: Add a new message link to popup.

Added a link to create a new message from the message
popup menu.

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

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

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

5 years agoMerge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle
David Monllao [Wed, 16 Nov 2016 05:49:51 +0000 (13:49 +0800)]
Merge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-56187-master' of git://github.com/damyon/moodle
David Monllao [Wed, 16 Nov 2016 05:35:38 +0000 (13:35 +0800)]
Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle

5 years agoMDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect
Cameron Ball [Wed, 16 Nov 2016 01:47:13 +0000 (09:47 +0800)]
MDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect

The markup in the filemanager_fileselect template was being escaped,
causing a help icon not to display.

Additionally, the popover for the help icon was not display since
"loader.js" was not properly delegating the popover calls.

5 years agoMerge branch 'MDL-56139_master' of git://github.com/markn86/moodle
David Monllao [Wed, 16 Nov 2016 03:51:18 +0000 (11:51 +0800)]
Merge branch 'MDL-56139_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56958-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 16 Nov 2016 03:07:20 +0000 (11:07 +0800)]
Merge branch 'MDL-56958-master' of git://github.com/damyon/moodle

5 years agoMDL-56139 core_message: removed unused constants
Mark Nelson [Tue, 15 Nov 2016 06:28:15 +0000 (14:28 +0800)]
MDL-56139 core_message: removed unused constants

5 years agoMDL-56139 core: changes after peer review
Mark Nelson [Thu, 10 Nov 2016 04:47:20 +0000 (12:47 +0800)]
MDL-56139 core: changes after peer review

- No longer use the Fibonacci sequence for delaying the timeout.
  It is too aggressive.
- The backoff_timer AMD module now expects the callback AND the
  backoff function to be passed to the constructor.
- Added ability to specify polling frequency in config.php.
- Added helper function to return the cache key.
- Reworded the parameters for clarity.

5 years agoMDL-56139 message: ajax poll for new messages in message area
Ryan Wyllie [Thu, 20 Oct 2016 06:01:57 +0000 (06:01 +0000)]
MDL-56139 message: ajax poll for new messages in message area

5 years agoMerge branch 'MDL-56703-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 16 Nov 2016 02:16:09 +0000 (10:16 +0800)]
Merge branch 'MDL-56703-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https...
Andrew Nicols [Wed, 16 Nov 2016 02:08:13 +0000 (10:08 +0800)]
Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle

5 years agoMerge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle
David Monllao [Wed, 16 Nov 2016 02:04:37 +0000 (10:04 +0800)]
Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle

5 years agoMDL-56703 boost: Fix mustache html warnings
Damyon Wiese [Tue, 15 Nov 2016 03:01:23 +0000 (11:01 +0800)]
MDL-56703 boost: Fix mustache html warnings

Don't put div in a span

5 years agoMDL-56703 boost: Escaping bug in flat nav and navbar
Damyon Wiese [Mon, 14 Nov 2016 05:30:49 +0000 (13:30 +0800)]
MDL-56703 boost: Escaping bug in flat nav and navbar

The items in the flat navigation were double escaped. Also added
context to template.

5 years agoMerge branch 'MDL-56193-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 16 Nov 2016 01:52:55 +0000 (09:52 +0800)]
Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle

5 years agoMDL-56967 boost: Fix for layout problem with IE11
Damyon Wiese [Tue, 15 Nov 2016 07:02:40 +0000 (15:02 +0800)]
MDL-56967 boost: Fix for layout problem with IE11

5 years agoMDL-55362 core: Fixed topic section default name empty h2 tag
Mathew May [Fri, 4 Nov 2016 01:18:21 +0000 (14:18 +1300)]
MDL-55362 core: Fixed topic section default name empty h2 tag

5 years agoMDL-56710 editor: Fix box-sizing to context box
Rajesh Taneja [Wed, 16 Nov 2016 00:37:15 +0000 (08:37 +0800)]
MDL-56710 editor: Fix box-sizing to context box

With BS4, box-sizing is border-box and this leads to
icon not shown properly. TinyMCE toolbar should use
box-sizing as context-box

5 years agoMerge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle
David Monllao [Wed, 16 Nov 2016 00:33:45 +0000 (08:33 +0800)]
Merge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle

5 years agoMerge branch 'MDL-55209' of https://github.com/NeillM/moodle
Andrew Nicols [Wed, 16 Nov 2016 00:24:39 +0000 (08:24 +0800)]
Merge branch 'MDL-55209' of https://github.com/NeillM/moodle

5 years agoMDL-56981 behat: Fixed xpath of radio button to contain class
Rajesh Taneja [Wed, 16 Nov 2016 00:14:07 +0000 (08:14 +0800)]
MDL-56981 behat: Fixed xpath of radio button to contain class

5 years agoMerge branch 'MDL-56942-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 16 Nov 2016 00:09:54 +0000 (08:09 +0800)]
Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https...
David Monllao [Tue, 15 Nov 2016 21:31:55 +0000 (05:31 +0800)]
Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle

5 years agoMDL-56917 core_upgrade: Do not use the raw version to check cURL caps.
Matteo Scaramuccia [Sat, 12 Nov 2016 22:35:40 +0000 (23:35 +0100)]
MDL-56917 core_upgrade: Do not use the raw version to check cURL caps.

Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, https://github.com/remicollet/remirepo/commit/87954ef9ca41

5 years agoMDL-48055 q_u_outline, q_u_complete: added checks for grade visibility.
Mike Churchward [Tue, 15 Nov 2016 17:35:38 +0000 (12:35 -0500)]
MDL-48055 q_u_outline, q_u_complete: added checks for grade visibility.

5 years agoMerge branch 'MDL-55848-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 15 Nov 2016 16:33:26 +0000 (16:33 +0000)]
Merge branch 'MDL-55848-master' of git://github.com/lameze/moodle

5 years agoMerge branch 'wip-mdl-56860' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 15 Nov 2016 16:29:59 +0000 (16:29 +0000)]
Merge branch 'wip-mdl-56860' of git://github.com/rajeshtaneja/moodle

5 years agoMDL-56767 block_login: add bootstrap markup
Dan Poltawski [Tue, 15 Nov 2016 15:22:58 +0000 (15:22 +0000)]
MDL-56767 block_login: add bootstrap markup

Remove existing overrides forcing the markup off

5 years agoMDL-56939 theme_boost: Link to MDL for future
Dan Poltawski [Tue, 15 Nov 2016 14:31:45 +0000 (14:31 +0000)]
MDL-56939 theme_boost: Link to MDL for future

5 years agoMerge branch 'MDL-56939-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 15 Nov 2016 14:29:35 +0000 (14:29 +0000)]
Merge branch 'MDL-56939-master' of git://github.com/damyon/moodle

5 years agoMDL-33960 mod_lti: fix page scroll
gabrielrosset [Tue, 15 Nov 2016 13:40:21 +0000 (14:40 +0100)]
MDL-33960 mod_lti: fix page scroll

5 years agoMDL-56908 upgrade: bootstrap styling for settings save button
Dan Poltawski [Tue, 15 Nov 2016 12:49:51 +0000 (12:49 +0000)]
MDL-56908 upgrade: bootstrap styling for settings save button

5 years agoon-demand release 3.2beta+
Dan Poltawski [Tue, 15 Nov 2016 11:02:52 +0000 (11:02 +0000)]
on-demand release 3.2beta+

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 15 Nov 2016 11:02:51 +0000 (11:02 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMerge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 15 Nov 2016 10:42:36 +0000 (10:42 +0000)]
Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle

5 years agoMDL-56903 lang: Merge English strings from the en_fix language pack
Helen Foster [Tue, 15 Nov 2016 10:03:42 +0000 (11:03 +0100)]
MDL-56903 lang: Merge English strings from the en_fix language pack

5 years agoMDL-56965 themes: Fix logo CSS for RTL
Ankit Agarwal [Tue, 15 Nov 2016 09:50:36 +0000 (15:20 +0530)]
MDL-56965 themes: Fix logo CSS for RTL

5 years agoMDL-56931 themes: restrict extra padding to edit mode only
Jake Dallimore [Tue, 15 Nov 2016 01:25:52 +0000 (09:25 +0800)]
MDL-56931 themes: restrict extra padding to edit mode only

5 years agoMerge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 15 Nov 2016 08:34:07 +0000 (16:34 +0800)]
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-56724 mod_choice: Improve alignment and checkboxes on dates
Damyon Wiese [Tue, 15 Nov 2016 07:24:38 +0000 (15:24 +0800)]
MDL-56724 mod_choice: Improve alignment and checkboxes on dates

5 years agoMerge branch 'wip-MDL-56899-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 15 Nov 2016 06:38:57 +0000 (14:38 +0800)]
Merge branch 'wip-MDL-56899-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-56690-master' of git://github.com/damyon/moodle
David Monllao [Tue, 15 Nov 2016 06:25:18 +0000 (14:25 +0800)]
Merge branch 'MDL-56690-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle
Andrew Nicols [Tue, 15 Nov 2016 06:02:43 +0000 (14:02 +0800)]
Merge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle

5 years agoMDL-56618 behat: Fix xpath for behat
Damyon Wiese [Tue, 15 Nov 2016 05:33:00 +0000 (13:33 +0800)]
MDL-56618 behat: Fix xpath for behat

We changed the output so the test needs to match

5 years agoMDL-56785 theme_boost: apply bs4 styles to search options checkboxes
Simey Lameze [Tue, 15 Nov 2016 04:02:08 +0000 (12:02 +0800)]
MDL-56785 theme_boost: apply bs4 styles to search options checkboxes

5 years agoMerge branch 'MDL-56844-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 15 Nov 2016 03:20:48 +0000 (11:20 +0800)]
Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56952-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 15 Nov 2016 02:18:01 +0000 (10:18 +0800)]
Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56905-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 15 Nov 2016 02:55:20 +0000 (10:55 +0800)]
Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-56823' of git://github.com/aolley/moodle
Andrew Nicols [Tue, 15 Nov 2016 02:04:21 +0000 (10:04 +0800)]
Merge branch 'MDL-56823' of git://github.com/aolley/moodle

5 years agoMerge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 15 Nov 2016 01:51:07 +0000 (09:51 +0800)]
Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56739-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 15 Nov 2016 01:40:17 +0000 (09:40 +0800)]
Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-56724-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 15 Nov 2016 01:17:10 +0000 (02:17 +0100)]
Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 15 Nov 2016 01:13:40 +0000 (02:13 +0100)]
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-56824-master' of git://github.com/damyon/moodle
David Monllao [Tue, 15 Nov 2016 01:03:52 +0000 (09:03 +0800)]
Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle
David Monllao [Tue, 15 Nov 2016 00:52:34 +0000 (08:52 +0800)]
Merge branch 'MDL-56834-master-fix1' of github.com/damyon/moodle

5 years agoMerge branch 'MDL-56846-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 15 Nov 2016 00:05:54 +0000 (08:05 +0800)]
Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle

5 years agoMerge branch 'MDL-54871' of https://github.com/bostelm/moodle
Dan Poltawski [Mon, 14 Nov 2016 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-54871' of https://github.com/bostelm/moodle

5 years agoMerge branch 'MDL-54782_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)]
Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56426_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 14 Nov 2016 14:03:10 +0000 (14:03 +0000)]
Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-56913' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)]
Merge branch 'MDL-56913' of git://github.com/timhunt/moodle

5 years agoMDL-56910 filepicker: fix eranously removed styles
Dan Poltawski [Tue, 15 Nov 2016 08:25:27 +0000 (08:25 +0000)]
MDL-56910 filepicker: fix eranously removed styles

No idea what happened to my testing of this change, but it was wrong.

5 years agoMDL-56911 themes: Resolve settings before calling parser
Ankit Agarwal [Tue, 15 Nov 2016 08:04:52 +0000 (13:34 +0530)]
MDL-56911 themes: Resolve settings before calling parser

5 years agoMDL-56939 boost: Fix for bootstrap select reset
Damyon Wiese [Mon, 14 Nov 2016 07:32:42 +0000 (15:32 +0800)]
MDL-56939 boost: Fix for bootstrap select reset

Bootstrap makes select form elements not using custom-select broken when
they have a size. The contents overflow the field.

5 years agoMDL-56193 theme_boost: Make the enrol users modal wider
Damyon Wiese [Tue, 15 Nov 2016 07:12:19 +0000 (15:12 +0800)]
MDL-56193 theme_boost: Make the enrol users modal wider

5 years agoMDL-56847 tags: exclude modules that are being deleted
Marina Glancy [Tue, 15 Nov 2016 06:33:46 +0000 (14:33 +0800)]
MDL-56847 tags: exclude modules that are being deleted

we don't check any access for admins for performance reasons, course modules
that are in the process of deletion should be filtered out on the early stage

5 years agoMDL-56958 ajax: Prefer the general renderer
Damyon Wiese [Tue, 15 Nov 2016 04:36:37 +0000 (12:36 +0800)]
MDL-56958 ajax: Prefer the general renderer

5 years agoMDL-56193 enrol_manual: Bootstrap styles for assign roles
Damyon Wiese [Tue, 15 Nov 2016 02:41:19 +0000 (10:41 +0800)]
MDL-56193 enrol_manual: Bootstrap styles for assign roles

Use a bootstrap popover for the assign roles form.