moodle.git
4 years agoMerge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 09:44:01 +0000 (10:44 +0100)]
Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle

4 years agoMDL-57338 templates: fix missing example variables
Dan Poltawski [Thu, 29 Dec 2016 08:03:47 +0000 (08:03 +0000)]
MDL-57338 templates: fix missing example variables

From Davids review, thanks

4 years agoMDL-57471 forms: Removing unresolved conflict line
David Monllao [Thu, 29 Dec 2016 07:54:36 +0000 (08:54 +0100)]
MDL-57471 forms: Removing unresolved conflict line

4 years agoMerge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 29 Dec 2016 07:43:37 +0000 (08:43 +0100)]
Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57331-master' of https://github.com/xow/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

4 years agoMerge branch 'MDL-57451-master' of https://github.com/lucisgit/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

4 years agoMerge branch 'MDL-55955_master' of git://github.com/markn86/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

4 years agoMerge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/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

4 years agoMerge branch 'MDL-57491_m33v3' of https://github.com/sbourget/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

4 years agoMerge branch 'MDL-57472-master' of git://github.com/danpoltawski/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

4 years agoMerge branch 'MDL-57417-master' of https://github.com/snake/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

4 years agoMerge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/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

4 years agoMerge branch 'MDL-57450-master' of git://github.com/danpoltawski/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

4 years agoMerge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/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

4 years agoMerge branch 'MDL-57357-master' of https://github.com/snake/moodle
David Monllao [Wed, 28 Dec 2016 10:15:29 +0000 (11:15 +0100)]
Merge branch 'MDL-57357-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-56488-master' of git://github.com/danpoltawski/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

4 years agoMerge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/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

4 years agoMerge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/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

4 years agoMDL-56488 boost: validate scss settings for parsable scss
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

4 years agoMDL-57357 auth: add behat coverage for remember username login feature
Jake Dallimore [Fri, 23 Dec 2016 02:42:16 +0000 (10:42 +0800)]
MDL-57357 auth: add behat coverage for remember username login feature

4 years agoMDL-57357 auth: fix the remember username feature on login page
Jake Dallimore [Fri, 23 Dec 2016 02:42:01 +0000 (10:42 +0800)]
MDL-57357 auth: fix the remember username feature on login page

4 years agoMDL-57417 navigation: fix legacy_activity_onclick_handler callback scope
Jake Dallimore [Fri, 16 Dec 2016 04:01:46 +0000 (12:01 +0800)]
MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope

4 years agoMDL-57491 report_log: Improve filtering code by using static entries
Stephen Bourget [Thu, 22 Dec 2016 21:11:36 +0000 (16:11 -0500)]
MDL-57491 report_log: Improve filtering code by using static entries

4 years agoMDL-57338 message: fix template component
Dan Poltawski [Thu, 22 Dec 2016 12:30:53 +0000 (12:30 +0000)]
MDL-57338 message: fix template component

4 years agoMDL-57338 templates: add missing example context
Dan Poltawski [Fri, 9 Dec 2016 12:17:39 +0000 (12:17 +0000)]
MDL-57338 templates: add missing example context

4 years agoMDL-57338 chart: add 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

4 years agoMDL-57338 mustache: fix admin_setting_tabs
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)

4 years agoMDL-57472 javascript-static: remove fix_column_widths()
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

4 years agoMDL-57471 forms: deprecate init_javascript_enhancement()
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.

4 years agoMDL-57451 theme_boost: Add checkboxgroup class to checkbox input element
Tony Butler [Mon, 19 Dec 2016 12:02:45 +0000 (12:02 +0000)]
MDL-57451 theme_boost: Add checkboxgroup class to checkbox input element

4 years agoweekly release 3.3dev
Dan Poltawski [Thu, 22 Dec 2016 08:15:04 +0000 (08:15 +0000)]
weekly release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

4 years agoMDL-57292 tool_lpimportcsv: Fix for unit tests.
Adrian Greeve [Thu, 22 Dec 2016 05:06:40 +0000 (13:06 +0800)]
MDL-57292 tool_lpimportcsv: Fix for unit tests.

4 years agoMDL-55955 mod_quiz: ensure duplicated override events are removed
Mark Nelson [Thu, 22 Dec 2016 04:41:32 +0000 (12:41 +0800)]
MDL-55955 mod_quiz: ensure duplicated override events are removed

4 years agoMerge branch 'MDL-57187-master-htmlaudiofix' of git://github.com/snake/moodle
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

4 years agoMDL-57187 filter_mediaplugin: fix audio tag height in chrome
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.

4 years agoMDL-56581 behat: Use proper steps to navigate to Permissions
Rajesh Taneja [Wed, 21 Dec 2016 04:51:17 +0000 (12:51 +0800)]
MDL-56581 behat: Use proper steps to navigate to Permissions

4 years agoMDL-57474 mailer: Make sure that our exlicit MessageID is trimmed
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.

4 years agoMDL-53814 behat: Use table step to check for string
Rajesh Taneja [Tue, 20 Dec 2016 23:35:07 +0000 (07:35 +0800)]
MDL-53814 behat: Use table step to check for string

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 20 Dec 2016 16:03:51 +0000 (00:03 +0800)]
Automatically generated installer lang files

4 years agoMDL-56581 boost: add styling for overriden permission highlight
Dan Poltawski [Tue, 20 Dec 2016 12:10:08 +0000 (12:10 +0000)]
MDL-56581 boost: add styling for overriden permission highlight

4 years agoMDL-56581 Roles: Permissions override screen not inherited styling
Jes Ackland-Snow [Thu, 20 Oct 2016 15:52:33 +0000 (17:52 +0200)]
MDL-56581 Roles: Permissions override screen not inherited styling

4 years agoMerge branch 'MDL-56547' of https://github.com/ak4t0sh/moodle
Eloy Lafuente (stronk7) [Tue, 20 Dec 2016 11:47:54 +0000 (12:47 +0100)]
Merge branch 'MDL-56547' of https://github.com/ak4t0sh/moodle

4 years agoMDL-57114 filemanager: apply btn-sm class to buttons
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.

4 years agoMerge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 20 Dec 2016 10:09:39 +0000 (11:09 +0100)]
Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle

4 years agoMDL-56640 templates: add example content
Dan Poltawski [Fri, 28 Oct 2016 16:38:35 +0000 (17:38 +0100)]
MDL-56640 templates: add example content

4 years agoMDL-56640 yui: remove moodle-core-formautosubmit
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

4 years agoMDL-56640 lesson: switch from YUI to jquery.change()
Dan Poltawski [Fri, 28 Oct 2016 14:22:56 +0000 (15:22 +0100)]
MDL-56640 lesson: switch from YUI to jquery.change()

4 years agoMDL-56640 js: yui to jquery for formautosubmit in select templates
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.

4 years agoMerge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 20 Dec 2016 09:19:23 +0000 (09:19 +0000)]
Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle

4 years agoMDL-57366 mod_lesson: Zero now acceptable numeric answer.
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.

4 years agoMDL-57251 navigation: Correct permission shows site admin
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.

4 years agoMDL-57251 administration: Updated coursecreator role.
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.

4 years agoMDL-53814 behat: Columns have been moved ahead
Rajesh Taneja [Tue, 20 Dec 2016 03:36:00 +0000 (11:36 +0800)]
MDL-53814 behat: Columns have been moved ahead

4 years agoMDL-57331 messaging: Fix sent messages appearing twice.
John Okely [Fri, 16 Dec 2016 02:22:47 +0000 (10:22 +0800)]
MDL-57331 messaging: Fix sent messages appearing twice.

4 years agoMerge branch 'MDL-57268-master' of https://github.com/xow/moodle
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

4 years agoMerge branch 'MDL-57386-master' of git://github.com/damyon/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

4 years agoMerge branch 'MDL-55568_m33v2' of https://github.com/sbourget/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

4 years agoMDL-56320 tool_mobile: rest protocol dependency added
David Monllao [Mon, 19 Dec 2016 14:11:00 +0000 (15:11 +0100)]
MDL-56320 tool_mobile: rest protocol dependency added

4 years agoMerge branch 'MDL-56320-m' of https://github.com/micaherne/moodle
David Monllao [Mon, 19 Dec 2016 14:05:14 +0000 (15:05 +0100)]
Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle

4 years agoMerge branch 'MDL-55575_B' of https://github.com/bostelm/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

4 years agoMerge branch 'MDL-56527-master' of git://github.com/mudrd8mz/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

4 years agoMDL-56640 templates: move select templates from boost to core
Dan Poltawski [Fri, 28 Oct 2016 13:41:35 +0000 (14:41 +0100)]
MDL-56640 templates: move select templates from boost to core

4 years agoMerge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 19 Dec 2016 12:21:06 +0000 (12:21 +0000)]
Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-57270_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 19 Dec 2016 12:04:16 +0000 (13:04 +0100)]
Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 19 Dec 2016 12:02:09 +0000 (13:02 +0100)]
Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle

4 years agoMerge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle
David Monllao [Mon, 19 Dec 2016 11:54:04 +0000 (12:54 +0100)]
Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle

4 years agoMerge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle
David Monllao [Mon, 19 Dec 2016 11:46:19 +0000 (12:46 +0100)]
Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle
Dan Poltawski [Mon, 19 Dec 2016 11:25:47 +0000 (11:25 +0000)]
Merge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle

4 years agoMerge branch 'MDL-57402' of git://github.com/timhunt/moodle
David Monllao [Mon, 19 Dec 2016 11:20:57 +0000 (12:20 +0100)]
Merge branch 'MDL-57402' of git://github.com/timhunt/moodle

4 years agoMDL-57450 enviroment: remove tls library check
Dan Poltawski [Mon, 19 Dec 2016 10:53:59 +0000 (10:53 +0000)]
MDL-57450 enviroment: remove tls library check

Unfortunately it has come to light that the version sniffing is just not
reliable at all, operating system vendors backport security patches to
older versions - so in many cases we reporting a problem which is not a
problem. False positives and the solution to self-compile or something
like php will be causing more harm than good.

4 years agoMerge branch 'MDL-41729-master' of git://github.com/lameze/moodle
David Monllao [Mon, 19 Dec 2016 10:51:43 +0000 (11:51 +0100)]
Merge branch 'MDL-41729-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https...
David Monllao [Mon, 19 Dec 2016 10:38:43 +0000 (11:38 +0100)]
Merge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https://github.com/lucaboesch/moodle

4 years agoMerge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle
Dan Poltawski [Mon, 19 Dec 2016 08:47:21 +0000 (08:47 +0000)]
Merge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle

4 years agoMerge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 19 Dec 2016 08:35:42 +0000 (08:35 +0000)]
Merge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle

4 years agoMDL-57268 auth_db: Unit tests for deletion from a large user set
John Okely [Fri, 2 Dec 2016 06:57:30 +0000 (14:57 +0800)]
MDL-57268 auth_db: Unit tests for deletion from a large user set

4 years agoMerge branch 'wip-mdl-57344' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 19 Dec 2016 00:56:02 +0000 (01:56 +0100)]
Merge branch 'wip-mdl-57344' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-54996 Calendar: Fix dates for future multi-day events
Stephen Bourget [Sat, 17 Dec 2016 14:48:41 +0000 (09:48 -0500)]
MDL-54996 Calendar: Fix dates for future multi-day events

Thanks to Martin Cunliffe for providing the fix

4 years agoMDL-52366 themes: check for templates in themedir
Rafal Domagalski [Fri, 16 Dec 2016 12:32:08 +0000 (13:32 +0100)]
MDL-52366 themes: check for templates in themedir

4 years agoMDL-57292 tool_lpimportcsv: display progress bar for large imports
Simey Lameze [Thu, 15 Dec 2016 03:05:21 +0000 (11:05 +0800)]
MDL-57292 tool_lpimportcsv: display progress bar for large imports

4 years agoMDL-52098 enrol: cohort now looks at instance status
Mathew May [Thu, 15 Dec 2016 03:22:37 +0000 (16:22 +1300)]
MDL-52098 enrol: cohort now looks at instance status

4 years agoMDL-53044 auth : force change on expired password
Arnaud Trouve [Fri, 9 Dec 2016 11:03:27 +0000 (12:03 +0100)]
MDL-53044 auth : force change on expired password

4 years agoMDL-56547 admin : add check on user deletion
Arnaud Trouve [Tue, 25 Oct 2016 21:38:40 +0000 (23:38 +0200)]
MDL-56547 admin : add check on user deletion

Check if the target user is not already deleted
and print an explicit error in that case.

4 years agoMDL-57293 lang/email: Improve emailvia string
Dan Poltawski [Tue, 13 Dec 2016 11:01:45 +0000 (11:01 +0000)]
MDL-57293 lang/email: Improve emailvia string

* Strip the https? part of url for existing strings
* Switch the string to (via shortname)

4 years agoweekly on-sync release 3.3dev
Andrew Nicols [Thu, 15 Dec 2016 03:34:52 +0000 (11:34 +0800)]
weekly on-sync release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 15 Dec 2016 03:34:48 +0000 (11:34 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMDL-57386 blocklib: wrong variable in is_block_present
Damyon Wiese [Thu, 15 Dec 2016 02:35:10 +0000 (10:35 +0800)]
MDL-57386 blocklib: wrong variable in is_block_present

This isn't reachable code in core moodle, but themes/plugins could call is_block_present to trigger it.

4 years agoMDL-57402 quiz editing: fix add heading after remove page break
Tim Hunt [Wed, 14 Dec 2016 16:17:17 +0000 (16:17 +0000)]
MDL-57402 quiz editing: fix add heading after remove page break

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 14 Dec 2016 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMDL-57270 core_message: trim message before it is sent
Mark Nelson [Wed, 14 Dec 2016 04:13:53 +0000 (12:13 +0800)]
MDL-57270 core_message: trim message before it is sent

4 years agoMDL-55715 calendar: Only update events from the current subscription
Stephen Bourget [Wed, 14 Dec 2016 02:36:08 +0000 (21:36 -0500)]
MDL-55715 calendar: Only update events from the current subscription

The iCal import should only update calendar events from the current
subscription not any subscription that contains the same event.

4 years agoMerge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 14 Dec 2016 01:55:34 +0000 (09:55 +0800)]
Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57380 behat: Check for list tags and text
Rajesh Taneja [Wed, 14 Dec 2016 01:37:35 +0000 (09:37 +0800)]
MDL-57380 behat: Check for list tags and text

after list tag span can be added on few browsers
like chrome 51.0, so test if text starts with
list tag and contains text

4 years agoMerge branch 'MDL-55062_master' of git://github.com/markn86/moodle
Andrew Nicols [Wed, 14 Dec 2016 01:26:10 +0000 (09:26 +0800)]
Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle

4 years agoMDL-55568 chat: chat_refresh_events should only create published events
Stephen Bourget [Sat, 19 Nov 2016 21:18:24 +0000 (16:18 -0500)]
MDL-55568 chat: chat_refresh_events should only create published events

4 years agoMerge branch 'MDL-55809-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 13 Dec 2016 19:05:15 +0000 (20:05 +0100)]
Merge branch 'MDL-55809-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-57125-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 13 Dec 2016 16:34:52 +0000 (16:34 +0000)]
Merge branch 'MDL-57125-master' of git://github.com/lameze/moodle

4 years agoMerge branch 'MDL-56810_master' of https://github.com/Syxton/moodle
Dan Poltawski [Tue, 13 Dec 2016 14:55:50 +0000 (14:55 +0000)]
Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle

4 years agoMerge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
Eloy Lafuente (stronk7) [Tue, 13 Dec 2016 11:00:46 +0000 (12:00 +0100)]
Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle

4 years agoMDL-55575 mod_glossary: Allow viewing all entries on one page
Henning Bostelmann [Sat, 19 Nov 2016 15:12:21 +0000 (15:12 +0000)]
MDL-55575 mod_glossary: Allow viewing all entries on one page