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
Dan Poltawski [Wed, 2 Nov 2016 14:41:10 +0000 (14:41 +0000)]
Merge branch 'MDL-55825-master' of git://github.com/junpataleta/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
Dan Poltawski [Wed, 2 Nov 2016 13:56:46 +0000 (13:56 +0000)]
MDL-56637 version: bump
Dan Poltawski [Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)]
Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle
Dan Poltawski [Wed, 2 Nov 2016 13:55:05 +0000 (13:55 +0000)]
MDL-56582 boost: add some misisng template context
Dan Poltawski [Wed, 2 Nov 2016 13:49:50 +0000 (13:49 +0000)]
Merge branch 'MDL-56582-master' of https://github.com/xow/moodle
Dan Poltawski [Wed, 2 Nov 2016 10:20:34 +0000 (10:20 +0000)]
MDL-56161 boost: fix confict resolution mistake
Dan Poltawski [Wed, 2 Nov 2016 10:14:00 +0000 (10:14 +0000)]
MDL-56161 boost: add missing example context
Dan Poltawski [Wed, 2 Nov 2016 09:36:09 +0000 (09:36 +0000)]
Merge branch 'MDL-56161-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
Dan Poltawski [Wed, 2 Nov 2016 09:03:05 +0000 (09:03 +0000)]
Merge branch 'MDL-56621-master-fix' of github.com/damyon/moodle
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.
Andrew Nicols [Wed, 2 Nov 2016 07:34:06 +0000 (15:34 +0800)]
Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 2 Nov 2016 06:01:54 +0000 (14:01 +0800)]
MDL-56698 mod_feedback: Make it look ok in boost
Simey Lameze [Tue, 1 Nov 2016 03:53:49 +0000 (11:53 +0800)]
MDL-56671 mod_scorm: fix styling issues on scorm module
David Monllao [Wed, 2 Nov 2016 06:55:00 +0000 (14:55 +0800)]
Merge branch 'MDL-56677-master' of git://github.com/lameze/moodle
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.
Andrew Nicols [Wed, 2 Nov 2016 06:30:08 +0000 (14:30 +0800)]
Merge branch 'wip-mdl-56273' of https://github.com/rajeshtaneja/moodle
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
Simey Lameze [Tue, 1 Nov 2016 08:13:05 +0000 (16:13 +0800)]
MDL-56677 core_cohort: fix style issues on cohort search fields
Andrew Nicols [Wed, 2 Nov 2016 06:01:15 +0000 (14:01 +0800)]
Merge branch 'MDL-56634-master' of git://github.com/ankitagarwal/moodle
David Monllao [Wed, 2 Nov 2016 05:29:46 +0000 (13:29 +0800)]
Merge branch 'MDL-56670-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 1 Nov 2016 05:54:30 +0000 (13:54 +0800)]
MDL-56670 mod_lesson: adds padding to end of lesson links
David Monllao [Wed, 2 Nov 2016 05:12:07 +0000 (13:12 +0800)]
Merge branch 'MDL-56323-master' of git://github.com/l-campbell/moodle
David Monllao [Wed, 2 Nov 2016 04:49:46 +0000 (12:49 +0800)]
Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle
David Monllao [Wed, 2 Nov 2016 04:41:48 +0000 (12:41 +0800)]
Merge branch 'wip_MDL-55913_master' of git://github.com/gjb2048/moodle
Ankit Agarwal [Mon, 31 Oct 2016 08:05:23 +0000 (13:35 +0530)]
MDL-56634 webservices: Remove script from api desc and clean desc printing
David Monllao [Wed, 2 Nov 2016 04:28:43 +0000 (12:28 +0800)]
Merge branch 'MDL-43796_master_blindmarking' of https://github.com/SWiT/moodle
Andrew Nicols [Wed, 2 Nov 2016 04:07:18 +0000 (12:07 +0800)]
Merge branch 'MDL-56673-master' of git://github.com/danpoltawski/moodle
Andrew Nicols [Wed, 2 Nov 2016 03:31:32 +0000 (11:31 +0800)]
Merge branch 'MDL-56469-M32' of git://github.com/lazydaisy/moodle
Andrew Nicols [Wed, 2 Nov 2016 02:13:42 +0000 (10:13 +0800)]
Merge branch 'MDL-48468' of https://github.com/mr-russ/moodle
David Monllao [Wed, 2 Nov 2016 01:57:45 +0000 (09:57 +0800)]
Merge branch 'MDL-56296-master' of git://github.com/damyon/moodle
David Monllao [Wed, 2 Nov 2016 01:14:09 +0000 (09:14 +0800)]
Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle
Damyon Wiese [Fri, 28 Oct 2016 04:34:11 +0000 (12:34 +0800)]
MDL-56161 boost: alignment static form elements
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.
Also use a span, not a label for unlabelable static form elements.
Dan Poltawski [Tue, 1 Nov 2016 21:31:04 +0000 (21:31 +0000)]
Merge branch 'MDL-54112-master' of https://github.com/hcpss-banderson/moodle
Dan Poltawski [Tue, 1 Nov 2016 21:29:32 +0000 (21:29 +0000)]
Merge branch 'master_MDL-47500' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 1 Nov 2016 21:26:05 +0000 (21:26 +0000)]
Merge branch 'mdl55456-master' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 1 Nov 2016 21:24:57 +0000 (21:24 +0000)]
Merge branch 'MDL-56402-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 1 Nov 2016 21:21:22 +0000 (21:21 +0000)]
Merge branch 'MDL-56530-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 1 Nov 2016 21:20:53 +0000 (21:20 +0000)]
Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 1 Nov 2016 18:48:41 +0000 (19:48 +0100)]
on-demand release 3.2dev+
Dan Poltawski [Tue, 1 Nov 2016 12:13:19 +0000 (12:13 +0000)]
Merge branch 'MDL-47162' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 1 Nov 2016 11:47:54 +0000 (12:47 +0100)]
MDL-47162 badges: site & profile badges do not have courseid
Because of that, we need to set the, now mandatory, SITEID for
those message events to be happy. This does not affect course or
activity badges, both coming with correct courseid.
Dan Poltawski [Tue, 1 Nov 2016 11:35:36 +0000 (11:35 +0000)]
Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle
John Beedell [Tue, 25 Oct 2016 12:32:03 +0000 (13:32 +0100)]
MDL-55930 Quiz: "Next page button" showing in sequential mode
Dan Poltawski [Tue, 1 Nov 2016 10:05:38 +0000 (10:05 +0000)]
MDL-56673 templatelibrary: return false when core template doesn't exist
Dan Poltawski [Tue, 1 Nov 2016 09:47:11 +0000 (09:47 +0000)]
Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 1 Nov 2016 09:10:08 +0000 (09:10 +0000)]
Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 1 Nov 2016 08:43:09 +0000 (08:43 +0000)]
Merge branch 'MDL-56514-master-fix1' of https://github.com/lameze/moodle
Simey Lameze [Mon, 31 Oct 2016 01:06:54 +0000 (09:06 +0800)]
MDL-56402 core_message: remove tabindex attr of not selected users
Simey Lameze [Tue, 1 Nov 2016 06:15:32 +0000 (14:15 +0800)]
MDL-56514 core_message: remove messaging enabled check
Damyon Wiese [Mon, 31 Oct 2016 02:34:12 +0000 (10:34 +0800)]
MDL-56587 theme_boost: Align header items
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
Andrew Nicols [Tue, 1 Nov 2016 02:55:23 +0000 (10:55 +0800)]
Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
Andrew Nicols [Tue, 1 Nov 2016 02:45:29 +0000 (10:45 +0800)]
Merge branch 'wip-MDL-56489-master-v2' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 1 Nov 2016 02:04:26 +0000 (10:04 +0800)]
MDL-56509 tool_usertours: Fetch all role shortnames
Adrian Greeve [Tue, 25 Oct 2016 09:22:57 +0000 (17:22 +0800)]
MDL-56489 Lib: force_settings_menu added to pagelib.
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
Simey Lameze [Mon, 31 Oct 2016 02:36:42 +0000 (10:36 +0800)]
MDL-56651 core_role: add styling to submit buttons
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 21:45:37 +0000 (22:45 +0100)]
Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 19:25:31 +0000 (20:25 +0100)]
Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 18:59:21 +0000 (19:59 +0100)]
Merge branch 'MDL-56188-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 18:42:38 +0000 (19:42 +0100)]
MDL-56297 forms: Normalize uses of 'url' fields to use size=60
While this is not related to this issue, when reviewing it was
detected that the size of those url fields was really small and
looking decided to add this bit of normalization over existing uses.
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 18:28:54 +0000 (19:28 +0100)]
Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 27 Oct 2016 03:59:58 +0000 (11:59 +0800)]
MDL-56588 theme_boost: Nice wrapping text in flat nav
When section titles were too long they did not wrap nicely.
Eric Merrill [Mon, 31 Oct 2016 18:13:13 +0000 (14:13 -0400)]
MDL-47162 core_message: Updating all uses of messaging to add courseid
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 16:23:11 +0000 (17:23 +0100)]
Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 31 Oct 2016 16:10:58 +0000 (17:10 +0100)]
Merge branch 'MDL-56155-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:54:22 +0000 (15:54 +0000)]
Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:36:21 +0000 (15:36 +0000)]
Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:20:45 +0000 (15:20 +0000)]
Merge branch 'MDL-56580-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:15:09 +0000 (15:15 +0000)]
Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:10:02 +0000 (15:10 +0000)]
Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 31 Oct 2016 15:04:55 +0000 (15:04 +0000)]
Merge branch 'MDL-56578-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 27 Oct 2016 02:11:35 +0000 (10:11 +0800)]
MDL-56578 theme_boost: Dismiss help popovers on next click
Damyon Wiese [Mon, 31 Oct 2016 13:21:10 +0000 (21:21 +0800)]
MDL-56621 templates: Add missing example contexts
Dan Poltawski [Mon, 31 Oct 2016 10:20:08 +0000 (10:20 +0000)]
Merge branch 'MDL-56610-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 31 Oct 2016 10:19:13 +0000 (10:19 +0000)]
Merge branch 'MDL-56523-master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 31 Oct 2016 10:06:26 +0000 (10:06 +0000)]
MDL-56514 message: fix whitespace
Dan Poltawski [Mon, 31 Oct 2016 10:03:59 +0000 (10:03 +0000)]
Merge branch 'MDL-56514-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 31 Oct 2016 09:57:03 +0000 (09:57 +0000)]
Merge branch 'MDL-56599-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 31 Oct 2016 09:35:21 +0000 (09:35 +0000)]
Merge branch 'MDL-56509-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 31 Oct 2016 09:10:06 +0000 (09:10 +0000)]
Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle
Russell Smith [Mon, 31 Oct 2016 08:44:05 +0000 (19:44 +1100)]
MDL-56273 cache: Use is_ready() to determine if cache is really ready.
Damyon Wiese [Mon, 31 Oct 2016 07:02:30 +0000 (15:02 +0800)]
MDL-56621 forms: Hide format menu if only one
This was a regression in the new templates for editors.
Simey Lameze [Thu, 27 Oct 2016 03:02:45 +0000 (11:02 +0800)]
MDL-56514 core_message: add missing is messaging enabled checks
Damyon Wiese [Mon, 31 Oct 2016 06:43:40 +0000 (14:43 +0800)]
MDL-56631 passwordunmask: Admin setting for password unmask not working
Andrew refactored the way it rendered the element, but did not update all the
templates (there is mforms element AND admin settings element).
See
3778a9226f05a6c0203b291a95378dd8a56c6516 for Andrews original change.
Andrew Nicols [Mon, 31 Oct 2016 06:10:37 +0000 (14:10 +0800)]
Merge branch 'MDL-56501-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 25 Oct 2016 06:40:36 +0000 (14:40 +0800)]
MDL-56501 message: introduce new manageallmessaging capability
Andrew Nicols [Mon, 31 Oct 2016 06:02:27 +0000 (14:02 +0800)]
Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 31 Oct 2016 06:00:36 +0000 (14:00 +0800)]
Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
Andrew Nicols [Mon, 31 Oct 2016 05:42:46 +0000 (13:42 +0800)]
Merge branch 'MDL-56583-master' of git://github.com/crazyserver/moodle
Russell Smith [Mon, 24 Oct 2016 00:14:59 +0000 (11:14 +1100)]
MDL-56273 cache: Ensure requirements are met for cache stores.
Ensure that the cache store requirements are met prior to attempting
to instantiate a class. Many of the constructors create connections
to external services requiring the installation and availability of
classes that are specified in are_requirements_met(). If they are
not checked properly you end up with PHP Fatal errors rather than
falling back to a different store that is capabable without the
the extra classes loaded.
Jun Pataleta [Tue, 25 Oct 2016 06:23:21 +0000 (14:23 +0800)]
MDL-56577 core_form: Let other option attrs to be set in select elements
Andrew Nicols [Mon, 31 Oct 2016 04:18:22 +0000 (12:18 +0800)]
Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle
Frédéric Massart [Thu, 6 Oct 2016 09:48:22 +0000 (11:48 +0200)]
MDL-56282 enrol_meta: Fix error when editing existing instances
We had a few problems here.
1/ The auto complete element was displaying the picker though the
field was frozen.
2/ Checking for existing enrolment including the courses chosen was
not checking if the courses found were in the instance we edit.
3/ Upon creation we support multiple courses but when editing we
should not expect more than the course in the instance being edited.
Andrew Nicols [Mon, 31 Oct 2016 04:03:00 +0000 (12:03 +0800)]
Merge branch 'MDL-56573-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 31 Oct 2016 03:58:28 +0000 (11:58 +0800)]
MDL-56138 messaging: Add tests for viewparticipants search restriction
Andrew Nicols [Mon, 31 Oct 2016 03:35:47 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-56138-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Mon, 31 Oct 2016 03:01:25 +0000 (11:01 +0800)]
Merge branch 'MDL-56638-master' of git://github.com/crazyserver/moodle
Adrian Greeve [Tue, 25 Oct 2016 06:59:46 +0000 (14:59 +0800)]
MDL-56138 messaging: Update to messaging unit tests.