David Monllao [Wed, 4 Jan 2017 05:02:44 +0000 (06:02 +0100)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
David Monllao [Wed, 4 Jan 2017 04:47:58 +0000 (05:47 +0100)]
MDL-57338 templates: Fix modal_cancel template name
Rajesh Taneja [Wed, 4 Jan 2017 00:59:40 +0000 (08:59 +0800)]
MDL-57536 availability: Fixed css for clean theme
Dan Poltawski [Tue, 3 Jan 2017 18:07:12 +0000 (18:07 +0000)]
Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
Ankit Agarwal [Thu, 8 Dec 2016 06:03:55 +0000 (11:33 +0530)]
MDL-56992 core_scss: Don't allow invalid files to be included
We allow only .scss files so allow files to be included only and only if they end in .scss and they exist on server under theme directory.
Andrew Nicols [Fri, 7 Oct 2016 02:56:29 +0000 (10:56 +0800)]
MDL-56225 mod_forum: Remove unnecessary attributes from update
Dan Marsden [Wed, 4 Jan 2017 02:43:46 +0000 (15:43 +1300)]
MDL-49557 mod_scorm: optionally strip quotes.
Dan Poltawski [Tue, 3 Jan 2017 08:16:22 +0000 (08:16 +0000)]
Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 3 Jan 2017 07:14:04 +0000 (15:14 +0800)]
MDL-52168 behat: Select iframe in which text needs to be checked
Eloy Lafuente (stronk7) [Tue, 3 Jan 2017 01:34:58 +0000 (02:34 +0100)]
Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)]
Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 17:59:16 +0000 (18:59 +0100)]
Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle
Juan Leyva [Mon, 26 Dec 2016 17:06:15 +0000 (18:06 +0100)]
MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS
Juan Leyva [Wed, 28 Dec 2016 10:58:46 +0000 (11:58 +0100)]
MDL-57536 availability: Document required selectors changes
MDL-55839 Introduced some changes in CSS selectors used by the form.js
file.
This caused contributed plugins to not work (javascript stop working)
when editing a module.
Eloy Lafuente (stronk7) [Mon, 2 Jan 2017 15:42:41 +0000 (16:42 +0100)]
Merge branch 'MDL-47198_curl_header' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:35:11 +0000 (12:35 +0000)]
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)]
Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 2 Jan 2017 12:15:01 +0000 (12:15 +0000)]
Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:46:44 +0000 (11:46 +0000)]
Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)]
Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 Jan 2017 10:44:35 +0000 (10:44 +0000)]
MDL-57532 calendar: tidy up button grouping
Dan Poltawski [Mon, 2 Jan 2017 10:34:58 +0000 (10:34 +0000)]
Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle
David Monllao [Fri, 30 Dec 2016 08:59:45 +0000 (09:59 +0100)]
Merge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle
David Monllao [Thu, 29 Dec 2016 07:38:43 +0000 (08:38 +0100)]
MDL-56926 theme_boost: Restore filepicker's filename and icons original spacing
Nadav Kavalerchik [Wed, 28 Dec 2016 22:08:54 +0000 (00:08 +0200)]
MDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides
Dan Poltawski [Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)]
Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle
Dan Poltawski [Thu, 29 Dec 2016 11:46:47 +0000 (11:46 +0000)]
Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle
Pau Ferrer Ocaña [Thu, 22 Dec 2016 11:59:55 +0000 (12:59 +0100)]
MDL-57512 categories: Use maxcategorydepth only when getting all cats
David Monllao [Thu, 29 Dec 2016 09:44:01 +0000 (10:44 +0100)]
Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 29 Dec 2016 08:03:47 +0000 (08:03 +0000)]
MDL-57338 templates: fix missing example variables
From Davids review, thanks
David Monllao [Thu, 29 Dec 2016 07:54:36 +0000 (08:54 +0100)]
MDL-57471 forms: Removing unresolved conflict line
David Monllao [Thu, 29 Dec 2016 07:43:37 +0000 (08:43 +0100)]
Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 28 Dec 2016 21:07:12 +0000 (22:07 +0100)]
Merge branch 'MDL-57331-master' of https://github.com/xow/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:20:04 +0000 (15:20 +0000)]
Merge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:11:56 +0000 (15:11 +0000)]
Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 28 Dec 2016 15:06:03 +0000 (15:06 +0000)]
Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle
David Monllao [Wed, 28 Dec 2016 12:53:19 +0000 (13:53 +0100)]
Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle
David Monllao [Wed, 28 Dec 2016 12:37:19 +0000 (13:37 +0100)]
Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 28 Dec 2016 12:17:15 +0000 (12:17 +0000)]
Merge branch 'MDL-57417-master' of https://github.com/snake/moodle
David Monllao [Wed, 28 Dec 2016 11:22:52 +0000 (12:22 +0100)]
Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 28 Dec 2016 10:45:34 +0000 (11:45 +0100)]
Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 28 Dec 2016 10:30:51 +0000 (10:30 +0000)]
Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle
Juan Leyva [Wed, 28 Dec 2016 10:24:40 +0000 (11:24 +0100)]
MDL-57395 course: New Web Service core_course_get_updates_since
David Monllao [Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)]
Merge branch 'MDL-57357-master' of https://github.com/snake/moodle
David Monllao [Wed, 28 Dec 2016 09:58:13 +0000 (10:58 +0100)]
Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 28 Dec 2016 09:13:29 +0000 (09:13 +0000)]
Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 28 Dec 2016 08:56:12 +0000 (08:56 +0000)]
Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle
Dan Marsden [Mon, 16 Nov 2015 16:54:45 +0000 (16:54 +0000)]
MDL-52168 mod_scorm: Fix issue when scorm does not define org.
Stephen Bourget [Mon, 26 Dec 2016 16:33:35 +0000 (11:33 -0500)]
MDL-57532 calendar: Add missing bootstrap classes
Dan Poltawski [Wed, 14 Dec 2016 10:47:33 +0000 (10:47 +0000)]
MDL-56488 boost: validate scss settings for parsable scss
* Parses the scss and fails validation if a parse error is found
* Does not detect the situation when variables are not present - this
would involve us parsing the entire tree and would be slow. It could
also change over time, depending on whats defined in the scss
from themes.
* Introduces a new admin_setting_scsscode to do this
Adrian Greeve [Tue, 20 Dec 2016 06:39:54 +0000 (14:39 +0800)]
MDL-57464 mod_lesson: fix notice with sub-clusters.
Jake Dallimore [Fri, 23 Dec 2016 02:42:16 +0000 (10:42 +0800)]
MDL-57357 auth: add behat coverage for remember username login feature
Jake Dallimore [Fri, 23 Dec 2016 02:42:01 +0000 (10:42 +0800)]
MDL-57357 auth: fix the remember username feature on login page
Jake Dallimore [Fri, 16 Dec 2016 04:01:46 +0000 (12:01 +0800)]
MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope
Dan Marsden [Thu, 22 Dec 2016 23:04:41 +0000 (12:04 +1300)]
MDL-49557 mod_scorm: fix AICC pre-requisite handling.
Dan Marsden [Tue, 20 Dec 2016 07:28:39 +0000 (20:28 +1300)]
MDL-50643 mod_scorm: redirect using current window instead of parent.
Stephen Bourget [Thu, 22 Dec 2016 21:11:36 +0000 (16:11 -0500)]
MDL-57491 report_log: Improve filtering code by using static entries
Dan Poltawski [Thu, 22 Dec 2016 12:30:53 +0000 (12:30 +0000)]
MDL-57338 message: fix template component
Dan Poltawski [Fri, 9 Dec 2016 12:17:39 +0000 (12:17 +0000)]
MDL-57338 templates: add missing example context
Dan Poltawski [Fri, 9 Dec 2016 12:17:31 +0000 (12:17 +0000)]
MDL-57338 chart: add example context
And fix aria roles
Dan Poltawski [Thu, 8 Dec 2016 15:53:54 +0000 (15:53 +0000)]
MDL-57338 mustache: fix admin_setting_tabs
* Add example context
* Fix validation issue (need role="tablist" to contain the tabs)
Dan Poltawski [Tue, 20 Dec 2016 15:57:26 +0000 (15:57 +0000)]
MDL-57472 javascript-static: remove fix_column_widths()
A bit of a hack applied nearly 12 years ago in
7979105c629050e744b9e889a95b6984cf912b03
Dan Poltawski [Tue, 20 Dec 2016 15:06:05 +0000 (15:06 +0000)]
MDL-57471 forms: deprecate init_javascript_enhancement()
This was half-finished and only used for the smartselect enhancement. That
enhancement doesn't work with theme_boost and is better replaced just
using the searchableselector element.
Michael Aherne [Thu, 24 Nov 2016 09:05:05 +0000 (09:05 +0000)]
MDL-57080 completion: Update completion expected date on reset
Tony Butler [Mon, 19 Dec 2016 12:02:45 +0000 (12:02 +0000)]
MDL-57451 theme_boost: Add checkboxgroup class to checkbox input element
Dan Poltawski [Thu, 22 Dec 2016 08:15:04 +0000 (08:15 +0000)]
weekly release 3.3dev
Dan Poltawski [Thu, 22 Dec 2016 08:15:02 +0000 (08:15 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Adrian Greeve [Thu, 22 Dec 2016 05:06:40 +0000 (13:06 +0800)]
MDL-57292 tool_lpimportcsv: Fix for unit tests.
Rajesh Taneja [Thu, 22 Dec 2016 04:42:39 +0000 (12:42 +0800)]
MDL-57494 behat: Fixed tags and removed reset in after_scenario
1. Added missing switch_window tags
2. Fixed switch_frame tags to use switch_iframe
3. Removed reset from after_scenario.
Mark Nelson [Thu, 22 Dec 2016 04:41:32 +0000 (12:41 +0800)]
MDL-55955 mod_quiz: ensure duplicated override events are removed
David Monllao [Wed, 21 Dec 2016 07:02:21 +0000 (08:02 +0100)]
Merge branch 'MDL-57187-master-htmlaudiofix' of git://github.com/snake/moodle
Jake Dallimore [Wed, 21 Dec 2016 05:46:42 +0000 (13:46 +0800)]
MDL-57187 filter_mediaplugin: fix audio tag height in chrome
Chrome's html5 audio tags don't have a height and 'auto' renders them
with zero height, so added a min height to address this.
Rajesh Taneja [Wed, 21 Dec 2016 04:51:17 +0000 (12:51 +0800)]
MDL-56581 behat: Use proper steps to navigate to Permissions
David Mudrák [Wed, 21 Dec 2016 00:11:32 +0000 (01:11 +0100)]
MDL-57474 mailer: Make sure that our exlicit MessageID is trimmed
The new version of phpmailer shipped with Moodle 3.2 has added check
that the explicitly provided MessageID matches /^<.*@.*>$/.
Values coming from our overridden moodle_phpmailer::addCustomHeader()
had a whitespace at the start. So the requested value was not used as
the Message-ID header and the default phpmailer value was used.
As a result, forum posts threading was broken in email clients.
Rajesh Taneja [Tue, 20 Dec 2016 23:35:07 +0000 (07:35 +0800)]
MDL-53814 behat: Use table step to check for string
AMOS bot [Tue, 20 Dec 2016 16:03:51 +0000 (00:03 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 20 Dec 2016 14:33:27 +0000 (14:33 +0000)]
MDL-44172 lib: remove example htaccess file
This is not being maintained and is outdated. Better handled in docs.
Dan Poltawski [Tue, 20 Dec 2016 12:10:08 +0000 (12:10 +0000)]
MDL-56581 boost: add styling for overriden permission highlight
Jes Ackland-Snow [Thu, 20 Oct 2016 15:52:33 +0000 (17:52 +0200)]
MDL-56581 Roles: Permissions override screen not inherited styling
Eloy Lafuente (stronk7) [Tue, 20 Dec 2016 11:47:54 +0000 (12:47 +0100)]
Merge branch 'MDL-56547' of https://github.com/ak4t0sh/moodle
Simey Lameze [Thu, 8 Dec 2016 07:41:04 +0000 (15:41 +0800)]
MDL-57114 filemanager: apply btn-sm class to buttons
This commit also creates a new css rule to fix the file picker icons misalignment.
David Monllao [Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)]
Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Fri, 28 Oct 2016 16:38:35 +0000 (17:38 +0100)]
MDL-56640 templates: add example content
Dan Poltawski [Fri, 28 Oct 2016 14:27:01 +0000 (15:27 +0100)]
MDL-56640 yui: remove moodle-core-formautosubmit
It's easily achieved with jquery primatives
Dan Poltawski [Fri, 28 Oct 2016 14:22:56 +0000 (15:22 +0100)]
MDL-56640 lesson: switch from YUI to jquery.change()
Dan Poltawski [Fri, 28 Oct 2016 14:22:41 +0000 (15:22 +0100)]
MDL-56640 js: yui to jquery for formautosubmit in select templates
I did not keep the 'nothing' behaviour in the js because I don't think
the nothing option needs special handling, given that its default
selection.
Dan Poltawski [Tue, 20 Dec 2016 09:19:23 +0000 (09:19 +0000)]
Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle
Adrian Greeve [Tue, 20 Dec 2016 06:01:30 +0000 (14:01 +0800)]
MDL-57366 mod_lesson: Zero now acceptable numeric answer.
When creating a numerical question. If the answer to the
question is 0 then the answer will not save.
Adrian Greeve [Thu, 8 Dec 2016 06:25:32 +0000 (14:25 +0800)]
MDL-57251 navigation: Correct permission shows site admin
If the user does not have the moodle/site:configview
capability then do not show them the site administration
link.
Adrian Greeve [Thu, 8 Dec 2016 05:51:55 +0000 (13:51 +0800)]
MDL-57251 administration: Updated coursecreator role.
The coursecreator role now has the moodle/site:configview
capability so that they have access to the required admin
pages.
Rajesh Taneja [Tue, 20 Dec 2016 03:36:00 +0000 (11:36 +0800)]
MDL-53814 behat: Columns have been moved ahead
John Okely [Fri, 16 Dec 2016 02:22:47 +0000 (10:22 +0800)]
MDL-57331 messaging: Fix sent messages appearing twice.
Eloy Lafuente (stronk7) [Tue, 20 Dec 2016 01:22:26 +0000 (02:22 +0100)]
Merge branch 'MDL-57268-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 19 Dec 2016 15:46:54 +0000 (15:46 +0000)]
Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 19 Dec 2016 14:33:05 +0000 (14:33 +0000)]
Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle
David Monllao [Mon, 19 Dec 2016 14:11:00 +0000 (15:11 +0100)]
MDL-56320 tool_mobile: rest protocol dependency added
David Monllao [Mon, 19 Dec 2016 14:05:14 +0000 (15:05 +0100)]
Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle
David Monllao [Mon, 19 Dec 2016 13:59:13 +0000 (14:59 +0100)]
Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle
David Monllao [Mon, 19 Dec 2016 13:03:53 +0000 (14:03 +0100)]
Merge branch 'MDL-56527-master' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 28 Oct 2016 13:41:35 +0000 (14:41 +0100)]
MDL-56640 templates: move select templates from boost to core
