Andrew Nicols [Wed, 9 Nov 2016 06:37:47 +0000 (14:37 +0800)]
Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 9 Nov 2016 06:35:41 +0000 (14:35 +0800)]
Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 9 Nov 2016 06:23:50 +0000 (14:23 +0800)]
Merge branch 'MDL-56133' of https://github.com/NeillM/moodle
David Monllao [Wed, 9 Nov 2016 06:14:51 +0000 (14:14 +0800)]
Merge branch 'wip-mdl-56630-fix2' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 9 Nov 2016 06:10:31 +0000 (14:10 +0800)]
MDL-56596 tool_usertours: Update to tours v0.9.9
David Monllao [Wed, 9 Nov 2016 05:58:01 +0000 (13:58 +0800)]
Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle
Rajesh Taneja [Wed, 9 Nov 2016 05:56:49 +0000 (13:56 +0800)]
MDL-56630 behat: Click on link in specificed block/region
Damyon Wiese [Tue, 1 Nov 2016 07:15:56 +0000 (15:15 +0800)]
MDL-56662 theme_boost: Filepickers have 0 height
We need to set a display value on the file picker body so the inline height is ignored.
David Monllao [Wed, 9 Nov 2016 05:07:26 +0000 (13:07 +0800)]
Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle
David Monllao [Wed, 9 Nov 2016 04:49:17 +0000 (12:49 +0800)]
Merge branch 'MDL-53481-master-uniqsqlparam' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 9 Nov 2016 04:24:17 +0000 (12:24 +0800)]
Merge branch 'MDL-56694-master' of git://github.com/lameze/moodle
Andrew Nicols [Wed, 9 Nov 2016 03:59:02 +0000 (11:59 +0800)]
Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 9 Nov 2016 03:27:57 +0000 (11:27 +0800)]
Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle
Simey Lameze [Tue, 8 Nov 2016 06:30:55 +0000 (14:30 +0800)]
MDL-56792 core_charts: clean html content from title and labels
This commit add cleanData() and call it from all places that has labels or title
to guarantee that html content will not be printed on the chart.
Andrew Nicols [Wed, 9 Nov 2016 01:39:48 +0000 (09:39 +0800)]
Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2016 01:11:55 +0000 (02:11 +0100)]
Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle
David Monllao [Wed, 9 Nov 2016 00:36:36 +0000 (08:36 +0800)]
Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 8 Nov 2016 17:56:12 +0000 (17:56 +0000)]
Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 8 Nov 2016 17:51:17 +0000 (17:51 +0000)]
Merge branch 'MDL-48498-master-iv6' of https://github.com/snake/moodle
Dan Poltawski [Tue, 8 Nov 2016 13:43:54 +0000 (13:43 +0000)]
Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle
David Mudrák [Tue, 8 Nov 2016 10:07:53 +0000 (11:07 +0100)]
MDL-53481 availability: Fix uniqueness of SQL named param placeholders
Static variables do not behave the way you might expect when accessing
them through the classes inheritance. When accessing a method via self::
or static:: operators, even though the method is inherited, its variable
scope is not. So the method unique_sql_parameter() was using the scope
of the child class and each child class had its own sequence of usp1,
usp2, usp3, ... placeholders. This led to "Incorrect number of query
parameters" error when multiuple condition classes were contributing to
a single SQL query.
All credit should go to Adam Olley who debugged and described the
essence of the problem in the tracker.
Neill Magill [Mon, 31 Oct 2016 10:48:15 +0000 (10:48 +0000)]
MDL-56133 tool_langimport: Changes should be visible after import
Before this change if a language pack was updated by the
\tool_langimport\task\update_langpacks_task scheduled task, changes
would not be available to users until an admin manually cleared the
strings cache.
This change causes the cache to purged when a language pack it update,
this will cause it to rebuild so users will start seeing updates
automatically.
Dan Poltawski [Tue, 8 Nov 2016 10:19:17 +0000 (10:19 +0000)]
Moodle release 3.2beta
Make Moodle Great Again ;-)
Dan Poltawski [Tue, 8 Nov 2016 10:19:16 +0000 (10:19 +0000)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Tue, 8 Nov 2016 10:19:15 +0000 (10:19 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Tue, 8 Nov 2016 10:06:09 +0000 (18:06 +0800)]
MDL-56630 behat: Click on link in specificed block/region
Juan Leyva [Tue, 8 Nov 2016 09:52:16 +0000 (09:52 +0000)]
MDL-56607 settings: Remove Mobile settings from WS overview
Ankit Agarwal [Thu, 27 Oct 2016 05:37:47 +0000 (11:07 +0530)]
MDL-56409 messages: Save one db query per page load
Jake Dallimore [Tue, 8 Nov 2016 06:41:18 +0000 (14:41 +0800)]
MDL-48498 core_files: Add security helper to curl class
Allow injection of security_helper objects into curl, but default
to a core helper tied to http security settings values.
Jake Dallimore [Tue, 8 Nov 2016 06:40:38 +0000 (14:40 +0800)]
MDL-48498 core_files: curl_security_helper_base and implementation
Base class and core implementation providing a means to check URLs
against the curl security admin settings entries.
Jake Dallimore [Tue, 8 Nov 2016 06:38:58 +0000 (14:38 +0800)]
MDL-48498 admin: new setting types for curl host/port restrictions
Two new classes in lib/adminlib. One providing validation for a
newline-delimited textarea supporting domain names, domain wildcards,
IPv4/IPv6 addresses and IPv4/IPv6 ranges. The second providing
validation for a newline-delimited textarea of port numbers.
Simey Lameze [Mon, 7 Nov 2016 03:34:48 +0000 (11:34 +0800)]
MDL-56694 theme_boost: center login button in filepicker
David Monllao [Tue, 8 Nov 2016 06:47:25 +0000 (14:47 +0800)]
Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 8 Nov 2016 06:38:48 +0000 (14:38 +0800)]
MDL-56630 behat: Click on link in specificed block/region
Andrew Nicols [Tue, 8 Nov 2016 06:31:33 +0000 (14:31 +0800)]
Merge branch 'wip-mdl-55215' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 8 Nov 2016 06:27:26 +0000 (14:27 +0800)]
MDL-56196 mod_lti: Fix popups and secret form in boost
Rajesh Taneja [Tue, 8 Nov 2016 06:21:52 +0000 (14:21 +0800)]
MDL-55215 behat: autocomplete field requires javascript
Frédéric Massart [Tue, 4 Oct 2016 11:11:42 +0000 (13:11 +0200)]
MDL-56196 mod_lti: Adapt templates for both Boost and Clean
Jake Dallimore [Tue, 8 Nov 2016 05:49:46 +0000 (13:49 +0800)]
MDL-54751 core_course: Fixed event type checks in adhoc deletion tests
Andrew Nicols [Tue, 8 Nov 2016 05:51:11 +0000 (13:51 +0800)]
MDL-56555 tool_usertours: Update tool sharing link
Andrew Nicols [Tue, 8 Nov 2016 05:40:00 +0000 (13:40 +0800)]
Merge branch 'MDL-55992-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 8 Nov 2016 04:45:57 +0000 (12:45 +0800)]
MDL-56737 externallib: Fetch token after inserting
David Monllao [Tue, 8 Nov 2016 04:25:31 +0000 (12:25 +0800)]
Merge branch 'MDL-56601-master-3' of git://github.com/cameron1729/moodle
Cameron Ball [Mon, 7 Nov 2016 03:00:49 +0000 (11:00 +0800)]
MDL-56601 core_user: Disable profile picture field if user is not setup
Sometimes it is possible that a user is presented with the profile
edit form, but is in a state where they are not considered fully
set up (one example is when a site is installed using the CLI script)
In these cases the filepicker gets upset when the user tries
to upload a profile picture.
This patch simply disables that field in these cases and replaces it
with an error message explaining what's wrong.
David Monllao [Tue, 8 Nov 2016 03:39:28 +0000 (11:39 +0800)]
MDL-56561 bootstrapbase: Remove empty line
David Monllao [Tue, 8 Nov 2016 03:38:49 +0000 (11:38 +0800)]
Merge branch 'MDL-56561-master' of git://github.com/damyon/moodle
David Monllao [Tue, 8 Nov 2016 03:12:17 +0000 (11:12 +0800)]
Merge branch 'MDL-29795-master-fix-backup-restore' of git://github.com/ilya-catalyst/moodle
Damyon Wiese [Wed, 26 Oct 2016 03:47:34 +0000 (11:47 +0800)]
MDL-56561 admin: Style admin page listing entire admin tree
It was an unstyled list of links. This changes it to tabs with sub-headings.
Andrew Nicols [Tue, 8 Nov 2016 02:31:12 +0000 (10:31 +0800)]
Merge branch 'wip-MDL-56120-master-v2' of git://github.com/abgreeve/moodle
David Monllao [Tue, 8 Nov 2016 02:27:36 +0000 (10:27 +0800)]
Merge branch 'MDL-56818-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 2 Nov 2016 02:18:53 +0000 (10:18 +0800)]
MDL-56818 messages: remove duplicated messaging enabled check
Ilya Tregubov [Tue, 8 Nov 2016 02:23:22 +0000 (13:23 +1100)]
MDL-29795 assign: add missing sortorder column for overrides when backing up a course
Andrew Nicols [Tue, 8 Nov 2016 02:01:04 +0000 (10:01 +0800)]
Merge branch 'MDL-54751_master-fix-cron-user' of git://github.com/dmonllao/moodle
David Monllao [Tue, 8 Nov 2016 01:59:31 +0000 (09:59 +0800)]
Merge branch 'MDL-53718' of git://github.com/aolley/moodle
David Monllao [Tue, 8 Nov 2016 00:24:02 +0000 (08:24 +0800)]
MDL-54751 course: Set adhoc task user
We should complete the deletion process using the same
user that started it.
Added a new param to loginas() to prevent the event to be generated as
there is no need to generate an new event for that as the user didn't
explicitly loginas again.
Eloy Lafuente (stronk7) [Tue, 8 Nov 2016 00:27:39 +0000 (01:27 +0100)]
Merge branch 'MDL-56765-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 7 Nov 2016 15:19:06 +0000 (16:19 +0100)]
Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle
Dan Poltawski [Mon, 7 Nov 2016 11:33:55 +0000 (11:33 +0000)]
Merge branch 'MDL-56696-master' of git://github.com/lameze/moodle
Juan Leyva [Wed, 26 Oct 2016 16:06:58 +0000 (17:06 +0100)]
MDL-56607 settings: Move mobile settings to top-level
AMOS BEGIN
MOV [mobilecssurl,core_admin],[mobilecssurl,tool_mobile]
MOV [configmobilecssurl,core_admin],[configmobilecssurl,tool_mobile]
AMOS END
From Plugins / Web Services / Mobile to Appearance / Mobile
Jan Dageförde [Sun, 6 Nov 2016 20:41:02 +0000 (21:41 +0100)]
MDL-54852 assignment: Suppress "leave page" warning after save
If the user navigates away from the grading page immediately
after saving the grading form, the browser warning can be
safely omitted, as there are no unsaved changes. This is achieved
by calling `reset_form_dirty_state()` of the core_formchangechecker
YUI module, which is responsible for the warning.
Dan Poltawski [Mon, 7 Nov 2016 09:01:24 +0000 (09:01 +0000)]
Merge branch 'wip-MDL-56788-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Fri, 4 Nov 2016 06:28:04 +0000 (14:28 +0800)]
MDL-56120 Calendar: Unit tests for getting events.
Added a unit test for checking that calendar_get_events
will only return events for activated activities.
Adrian Greeve [Fri, 4 Nov 2016 04:49:34 +0000 (12:49 +0800)]
MDL-56120 calendar: Fix disabled modules showing events.
calendar_get_events now checks for disabled activities
and only shows events for active modules.
Dan Poltawski [Mon, 7 Nov 2016 08:19:16 +0000 (08:19 +0000)]
Merge branch 'MDL-56684-master-fix1' of github.com/damyon/moodle
Damyon Wiese [Mon, 7 Nov 2016 08:02:44 +0000 (16:02 +0800)]
MDL-56684 boost: Fix for competency behat tests with boost theme
Andrew Nicols [Mon, 7 Nov 2016 07:09:47 +0000 (15:09 +0800)]
Merge branch 'MDL-56025-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 7 Nov 2016 07:01:46 +0000 (15:01 +0800)]
Merge branch 'MDL-55215-master-fix2' of github.com/damyon/moodle
David Monllao [Mon, 7 Nov 2016 06:43:23 +0000 (14:43 +0800)]
Merge branch 'MDL-54751-master-gradeitemfix' of git://github.com/snake/moodle
Damyon Wiese [Fri, 28 Oct 2016 01:05:31 +0000 (09:05 +0800)]
MDL-56025 messages: Reduce the height on short screens
On windows shorter than 670px reduce the height of the message area.
Jake Dallimore [Mon, 7 Nov 2016 05:50:36 +0000 (13:50 +0800)]
MDL-54751 core_grade: Fix missing require_once in grade_item get_name
Simey Lameze [Mon, 7 Nov 2016 06:35:13 +0000 (14:35 +0800)]
MDL-56696 message: link user full name to contact options
Damyon Wiese [Mon, 7 Nov 2016 06:23:46 +0000 (14:23 +0800)]
MDL-55215 lesson: JS is required for some lesson behats
Lesson is using the searchselector which only supports JS - so some
tests need javascript tags.
Also fixed support for filling a passwordunmask field with JS enabled by
id.
David Monllao [Mon, 7 Nov 2016 06:19:15 +0000 (14:19 +0800)]
Merge branch 'wip-MDL-38158-fix3' of https://github.com/marinaglancy/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
Adam Olley [Thu, 3 Nov 2016 23:48:25 +0000 (10:18 +1030)]
MDL-53718 badges: Dont display course badges when disabled
Andrew Nicols [Mon, 7 Nov 2016 05:25:41 +0000 (13:25 +0800)]
Merge branch 'MDL-56737-master' of git://github.com/jleyva/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
Ankit Agarwal [Tue, 25 Oct 2016 08:09:14 +0000 (13:39 +0530)]
MDL-56409 messages: Do not fetch notifications if they are disabled
Marina Glancy [Mon, 7 Nov 2016 03:33:06 +0000 (11:33 +0800)]
MDL-38158 media: some players do not want fallback to other players
there is already logic to determine whether html5 is supported;
otherwise we may end up with nested <audio> or <video> tags
Marina Glancy [Mon, 7 Nov 2016 02:00:51 +0000 (10:00 +0800)]
MDL-38158 media: mpeg is not html5 supported format
Andrew Nicols [Mon, 7 Nov 2016 03:39:45 +0000 (11:39 +0800)]
Merge branch 'MDL-55215-master-fix1' of github.com/damyon/moodle
Adrian Greeve [Mon, 7 Nov 2016 01:52:30 +0000 (09:52 +0800)]
MDL-56788 themes: Update require to use admin setting.
The renderer now uses the $CFG->admin setting in the
require_once call.
David Monllao [Mon, 7 Nov 2016 03:15:58 +0000 (11:15 +0800)]
Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 7 Nov 2016 03:03:17 +0000 (11:03 +0800)]
MDL-55215 forms: Searchable selector was reindexing keys
David Monllao [Mon, 7 Nov 2016 02:44:32 +0000 (10:44 +0800)]
Merge branch 'MDL-56731_master' of https://github.com/tonynlin/moodle
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
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.
Andrew Nicols [Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)]
Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle
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.
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.
David Monllao [Mon, 7 Nov 2016 01:49:33 +0000 (09:49 +0800)]
Merge branch 'MDL-55203' of https://github.com/mr-russ/moodle
Dan Poltawski [Thu, 3 Nov 2016 11:00:38 +0000 (11:00 +0000)]
MDL-56241 theme_boost: add example context to block.mustache
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.
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
David Monllao [Mon, 7 Nov 2016 01:22:02 +0000 (09:22 +0800)]
MDL-29795 mod_assign: Remove empty line
David Monllao [Mon, 7 Nov 2016 01:20:59 +0000 (09:20 +0800)]
Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle
David Monllao [Mon, 7 Nov 2016 01:18:07 +0000 (09:18 +0800)]
MDL-29795 behat: Narrow Edit link scope
Andrew Nicols [Mon, 7 Nov 2016 01:06:40 +0000 (09:06 +0800)]
MDL-55215 forms: Rename searchableselector params
Andrew Nicols [Mon, 7 Nov 2016 01:04:34 +0000 (09:04 +0800)]
Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle
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.