Andrew Nicols [Wed, 16 Nov 2016 06:05:07 +0000 (14:05 +0800)]
Merge branch 'MDL-56967-master' of git://github.com/damyon/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
David Monllao [Wed, 16 Nov 2016 05:49:51 +0000 (13:49 +0800)]
Merge branch 'MDL-56784-master' of git://github.com/cameron1729/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
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.
David Monllao [Wed, 16 Nov 2016 03:51:18 +0000 (11:51 +0800)]
Merge branch 'MDL-56139_master' of git://github.com/markn86/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
Mark Nelson [Tue, 15 Nov 2016 06:28:15 +0000 (14:28 +0800)]
MDL-56139 core_message: removed unused constants
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.
Ryan Wyllie [Thu, 20 Oct 2016 06:01:57 +0000 (06:01 +0000)]
MDL-56139 message: ajax poll for new messages in message area
Andrew Nicols [Wed, 16 Nov 2016 02:16:09 +0000 (10:16 +0800)]
Merge branch 'MDL-56703-master' of git://github.com/damyon/moodle
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
David Monllao [Wed, 16 Nov 2016 02:04:37 +0000 (10:04 +0800)]
Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle
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
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.
Andrew Nicols [Wed, 16 Nov 2016 01:52:55 +0000 (09:52 +0800)]
Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 15 Nov 2016 07:02:40 +0000 (15:02 +0800)]
MDL-56967 boost: Fix for layout problem with IE11
David Monllao [Wed, 16 Nov 2016 00:33:45 +0000 (08:33 +0800)]
Merge branch 'master_MDL-56358' of git://github.com/danmarsden/moodle
Andrew Nicols [Wed, 16 Nov 2016 00:24:39 +0000 (08:24 +0800)]
Merge branch 'MDL-55209' of https://github.com/NeillM/moodle
Rajesh Taneja [Wed, 16 Nov 2016 00:14:07 +0000 (08:14 +0800)]
MDL-56981 behat: Fixed xpath of radio button to contain class
David Monllao [Wed, 16 Nov 2016 00:09:54 +0000 (08:09 +0800)]
Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle
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
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
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.
Dan Poltawski [Tue, 15 Nov 2016 16:33:26 +0000 (16:33 +0000)]
Merge branch 'MDL-55848-master' of git://github.com/lameze/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
Dan Poltawski [Tue, 15 Nov 2016 14:31:45 +0000 (14:31 +0000)]
MDL-56939 theme_boost: Link to MDL for future
Dan Poltawski [Tue, 15 Nov 2016 14:29:35 +0000 (14:29 +0000)]
Merge branch 'MDL-56939-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 15 Nov 2016 11:02:52 +0000 (11:02 +0000)]
on-demand release 3.2beta+
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
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
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
Jake Dallimore [Tue, 15 Nov 2016 01:25:52 +0000 (09:25 +0800)]
MDL-56931 themes: restrict extra padding to edit mode only
David Monllao [Tue, 15 Nov 2016 08:34:07 +0000 (16:34 +0800)]
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 15 Nov 2016 07:24:38 +0000 (15:24 +0800)]
MDL-56724 mod_choice: Improve alignment and checkboxes on dates
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
David Monllao [Tue, 15 Nov 2016 06:25:18 +0000 (14:25 +0800)]
Merge branch 'MDL-56690-master' of git://github.com/damyon/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
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
Simey Lameze [Tue, 15 Nov 2016 04:02:08 +0000 (12:02 +0800)]
MDL-56785 theme_boost: apply bs4 styles to search options checkboxes
Andrew Nicols [Tue, 15 Nov 2016 03:20:48 +0000 (11:20 +0800)]
Merge branch 'MDL-56844-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
David Monllao [Tue, 15 Nov 2016 02:55:20 +0000 (10:55 +0800)]
Merge branch 'MDL-56905-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 15 Nov 2016 02:04:21 +0000 (10:04 +0800)]
Merge branch 'MDL-56823' of git://github.com/aolley/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
David Monllao [Tue, 15 Nov 2016 01:40:17 +0000 (09:40 +0800)]
Merge branch 'MDL-56739-master' of git://github.com/jleyva/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
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
David Monllao [Tue, 15 Nov 2016 01:03:52 +0000 (09:03 +0800)]
Merge branch 'MDL-56824-master' of git://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
Andrew Nicols [Tue, 15 Nov 2016 00:05:54 +0000 (08:05 +0800)]
Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 14 Nov 2016 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-54871' of https://github.com/bostelm/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
Dan Poltawski [Mon, 14 Nov 2016 14:03:10 +0000 (14:03 +0000)]
Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)]
Merge branch 'MDL-56913' of git://github.com/timhunt/moodle
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.
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.
Damyon Wiese [Tue, 15 Nov 2016 07:12:19 +0000 (15:12 +0800)]
MDL-56193 theme_boost: Make the enrol users modal wider
Damyon Wiese [Tue, 15 Nov 2016 04:36:37 +0000 (12:36 +0800)]
MDL-56958 ajax: Prefer the general renderer
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.
Damyon Wiese [Mon, 14 Nov 2016 06:36:40 +0000 (14:36 +0800)]
MDL-56193 enrol: Modernise the enrol users popup
This just injects bootstrap classes into the old yui2 thing. It needs
rewriting.
Damyon Wiese [Wed, 9 Nov 2016 01:18:10 +0000 (09:18 +0800)]
MDL-56844 scorm: Review styles in boost theme
The main change is that in boost we get rid of the random centered text.
To compensate we use "container" which is fixed with with auto margins -
but the text is still left aligned.
David Monllao [Tue, 15 Nov 2016 02:55:20 +0000 (10:55 +0800)]
Merge branch 'MDL-56905-master' of git://github.com/jleyva/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
Andrew Nicols [Tue, 15 Nov 2016 02:04:21 +0000 (10:04 +0800)]
Merge branch 'MDL-56823' of git://github.com/aolley/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
David Monllao [Tue, 15 Nov 2016 01:40:17 +0000 (09:40 +0800)]
Merge branch 'MDL-56739-master' of git://github.com/jleyva/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
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
Simey Lameze [Fri, 9 Sep 2016 06:03:03 +0000 (14:03 +0800)]
MDL-55848 assignfeedback_editpdf: remove problematic class_exists check
Due to a bug on opcache, this check had to be removed along the empty class to avoid
error on assignment grading interface.
David Monllao [Tue, 15 Nov 2016 01:03:52 +0000 (09:03 +0800)]
Merge branch 'MDL-56824-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 15 Nov 2016 00:55:41 +0000 (08:55 +0800)]
MDL-56952 plugininfo: You can uninstall theme_base
David Monllao [Tue, 15 Nov 2016 00:52:34 +0000 (08:52 +0800)]
Merge branch 'MDL-56834-master-fix1' of 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
Dan Poltawski [Mon, 14 Nov 2016 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-54871' of https://github.com/bostelm/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
Dan Poltawski [Fri, 11 Nov 2016 13:14:30 +0000 (13:14 +0000)]
MDL-56910 filepicker: give button BS styling
Dan Poltawski [Mon, 14 Nov 2016 14:03:10 +0000 (14:03 +0000)]
Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)]
Merge branch 'MDL-56913' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:39:56 +0000 (13:39 +0000)]
Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:21:35 +0000 (13:21 +0000)]
Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:09:48 +0000 (13:09 +0000)]
Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 14 Nov 2016 13:06:48 +0000 (13:06 +0000)]
Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 14 Nov 2016 12:38:32 +0000 (12:38 +0000)]
Merge branch 'MDL-56618-master' of git://github.com/damyon/moodle
Juan Leyva [Mon, 14 Nov 2016 12:07:54 +0000 (12:07 +0000)]
MDL-56942 login: Add missing required lib in complete_user_login
Eloy Lafuente (stronk7) [Mon, 14 Nov 2016 11:13:18 +0000 (12:13 +0100)]
Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 14 Nov 2016 11:06:54 +0000 (11:06 +0000)]
MDL-56719 mod_chat: clarify 'course theme' change
Plus remove some pointless code.
Dan Poltawski [Mon, 14 Nov 2016 11:06:22 +0000 (11:06 +0000)]
Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 14 Nov 2016 11:04:25 +0000 (12:04 +0100)]
Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 14 Nov 2016 10:49:23 +0000 (10:49 +0000)]
Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 14 Nov 2016 10:14:37 +0000 (11:14 +0100)]
Merge branch 'MDL-56882-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Mon, 14 Nov 2016 10:10:54 +0000 (10:10 +0000)]
Merge branch 'MDL-56435-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 14 Nov 2016 10:03:48 +0000 (10:03 +0000)]
Merge branch 'MDL-56931-master' of https://github.com/snake/moodle
Damyon Wiese [Mon, 14 Nov 2016 09:16:38 +0000 (17:16 +0800)]
MDL-56834 boost: Be cautious about nodes in the navbar
Some pages (fresh install) don't have the navbar yet, so check for null.
Pau Ferrer Ocaña [Thu, 10 Nov 2016 15:54:03 +0000 (16:54 +0100)]
MDL-56882 assign: Enable revert outcomes to No outcome
Dan Poltawski [Mon, 14 Nov 2016 08:34:13 +0000 (08:34 +0000)]
Merge branch 'MDL-56398-master' of git://github.com/lameze/moodle
David Monllao [Mon, 14 Nov 2016 08:25:43 +0000 (16:25 +0800)]
Merge branch 'MDL-56803-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 14 Nov 2016 08:21:14 +0000 (08:21 +0000)]
Merge branch 'MDL-56711-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 14 Nov 2016 08:02:55 +0000 (16:02 +0800)]
MDL-56803 boost: hide region-main settings menu on 1 col layouts
Mark Nelson [Mon, 14 Nov 2016 08:02:42 +0000 (16:02 +0800)]
MDL-56426 core_message: prevent page jump when viewing notif. settings
