Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle

MDL-41568 Merge English strings from the en_fix language pack

Merge branch 'mdl26_MDL-41403_backup_reduce_memory_usage' of https://github.com/brki/moodle

Merge branch 'MDL-41348' of git://github.com/timhunt/moodle

Merge branch 'mdl41304-master' of git://github.com/tlock/moodle

Merge branch 'MDL-29954-master' of git://github.com/danpoltawski/moodle

MDL-35925 filepicker - Fixing behat tests

Merge branch 'wip-MDL-23044-master' of git://github.com/marinaglancy/moodle

Merge branch 'wip-mdl-41413-int' of git://github.com/rajeshtaneja/moodle

MDL-23044 Use Files API functions in filesystem cron

MDL-41413 Events: replaced course_deleted event handler with observer

MDL-41413 Events: replaced role_unassigned event handler with observer

MDL-41413 Events: replaced role_assigned event handler with observer

Merge branch 'MDL-37564' of https://github.com/nebgor/moodle

Merge branch 'MDL-33472-master' of git://github.com/danpoltawski/moodle

Merge branch 'm26_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle

Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle

Merge branch 'MDL-41440_master' of https://github.com/markn86/moodle

Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle

Merge branch 'MDL-41428-master' of git://github.com/FMCorz/moodle

Merge branch 'wip-MDL-41179-master' of git://github.com/marinaglancy/moodle

MDL-41256 course tests: improve robustness

* Fail if an exception isn't recieved
* Don't allow the possibility of an undefined variable being tested

Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle

Merge branch 'wip-MDL-41317-master' of git://github.com/marinaglancy/moodle

Merge branch 'MDL-40214_master' of https://github.com/markn86/moodle

MDL-31890 version bump

(and trailing whitespace fix)

Merge branch 'wip-MDL-31890-master' of git://github.com/marinaglancy/moodle

Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle

MDL-29218 Repository: fixed a typo in the PHPDoc

MDL-29218 Repository: $pname, get rid of all the useless code

More details in the Tracker.

MDL-29218 Repository: Hide the repo if repository::plugin_init returns false

Merge branch 'MDL-38190-master' of git://github.com/sammarshallou/moodle

Conflicts:
backup/import.php
theme/bootstrapbase/style/moodle.css

Merge branch '41214-26' of git://github.com/samhemelryk/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

Merge branch 'MDL-41149-master' of git://github.com/damyon/moodle

Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle

MDL-41402 tool_generator: Changing plugin name according to the new feature

MDL-41402 tool_generator: increment version

MDL-41402 tool_generator: fix whitespace

Merge branch 'MDL-41402_master' of git://github.com/dmonllao/moodle

MDL-41402 tool_generator: Adding maketestsite script

Uses maketestcourse.php to set up
a test site.

MDL-41402 tool_generator: Refactoring backend class

Moving it to course_backend keeping generic
methods and attributes in backend class.

AMOS BEGIN
 MOV [size_0,tool_generator],[coursesize_0,tool_generator]
 MOV [size_1,tool_generator],[coursesize_1,tool_generator]
 MOV [size_2,tool_generator],[coursesize_2,tool_generator]
 MOV [size_3,tool_generator],[coursesize_3,tool_generator]
 MOV [size_4,tool_generator],[coursesize_4,tool_generator]
 MOV [size_5,tool_generator],[coursesize_5,tool_generator]
AMOS END

Merge branch 'MDL-41399_master-remove_test' of git://github.com/dmonllao/moodle

MDL-39961 Events: Replace Legacy events - User

This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event

MDL-41399 tool_generator: Removing unit test

Removing dodgy database reset in the
middle of a test as sequences reset
is not allowed.

Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle

Merge branch 'MDL-35925-master' of git://github.com/phalacee/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle

Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle

Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle

MDL-40676 tests: fix null byte test.

MDL-40712 badges: Display recipient information

MDL-40924 badges: Add caching to external badges

MDL-40676 ignore null bytes

Merge branch 'MDL-41175_M26' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

Merge branch 'MDL-41328-master' of git://github.com/damyon/moodle

MDL-41328 Editor: Work around another iOS issue with TinyMCE

We apply this only on touchend and not touchstart or touchmove. The
location is not guaranteed until the end of the gesture, and there's no
need to keep applying focus on every move.

MDL-31890 corrected whitespaces and phdocs

MDL-41516 Themes: Ensure that blocks are set up early

Blocks can require JavaScript which must be set up early in the page
lifecycle.
In order to do so, we should ensure that content is created in the standard
head setup before any other output is created so that any subsequent use of
block instances are no longer the first such use when they may already be
too late in the lifecycle.

MDL-31890 added core_grading_get_gradingform_instances web service
function

MDL-41432 output: several action_menu improvements

The following improvements have been made:
* Items no longer MUST have an icon, it can now be null instead.
* You can specify the icon displayed to toggle the dropdown menu.
* You can add text in front of the aforementioned icon.

MDL-41214 notification: now looks at menubar zIndex as well

MDL-20045 add support for custom context levels

MDL-41255 fix incorrect redirection logic when changing password

Credit goes to Michael Milette.

MDL-41399 tool_generator: Unit test for fixeddataset

MDL-41399 tool_generator: Adding fixeddataset option

MDL-41179 is_user_access_restricted_by_capability() must look at specified user and not current

MDL-23044 Support for storing thumbnails in repository filesystem

weekly release 2.6dev

ie9 svg compatibility fixes

MDL-32690: Restore 1.9 backup into 2.X fails on missing assignment type

Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins

MDL-40931 theme_bootstrapbase: fixed missing ! when including html5shiv

Revert "MDL-39871 Find a solution to handling RTL switching in CSS"

This reverts commit 2e68b1254f4613c679bc7338a097d63f09b4089e.
This reverts commit 5b2ed8b5ff3160e85c6b7135739334f648535501.

Revert "MDL-40752 - Login panel should be placed on the right side, in RTL mode (theme/clean, bootstrap)"

This reverts commit 48e5db7428dfaaca81e326688b29fdc02dbf1566.

Conflicts:

theme/bootstrapbase/style/moodle.css

Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

MDL-41213 theme_bootstrapbase: fixed license filemanager overflow

MDL-39682 Forms, File Picker, Themes: Fix alignment of Form's Labels and Input elements in RTL mode (theme/clean)

MDL-36093 grade export: Fix HTML special characters printed litteraly.

MDL-41403 Backup: reduce memory usage when searching for courses / categories

Also makes a few existing comments in the changed code area adhere to coding standards.

MDL-41348 question code depends on filelib.

I think this used to work because mod/forum/lib.php used to be included
everywhere, and in turn included lib/formslib.php. We should declare the
dependencey explicitly.

Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle

MDL-41249 assign: Fix incorrect gradingform restore step

The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.

MDL-35925 File picker - Improving accessibility by adding focus and removing unnecessary alt attribs

MDL-41245 fix redirect and missing string when cannot automatically delete uninstalled plugin

MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore.

MDL-29954 repository: remove dead code

Also remove repository_attach_id() which was never used and not useful.

Merge branch 'MDL-41098-master-fix1' of git://github.com/damyon/moodle

Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle

MDL-41259 when duplicate course shortname exists an exception is thrown and sync is aborted

Merge branch 'm26_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle

MDL-41098 atto: Enable atto text editor on upgrade

TinyMCE is still the default.

MDL-41098 atto: Fix min-height on firefox.

Merge branch 'MDL-41366' of git://github.com/timhunt/moodle

MDL-41440 event: fixed incorrect treatment of get_string as a class

Merge branch 'MDL-41364' of git://github.com/timhunt/moodle

Merge branch 'wip-mdl-41415' of git://github.com/rajeshtaneja/moodle

Merge branch 'wip-MDL-41127-master' of git://github.com/marinaglancy/moodle

Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle

Merge branch 'MDL-39682_master' of https://github.com/nadavkav/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

Conflicts:
version.php

MDL-40052 events: Code style fixes