MDL-41908 QuickForm: Fix PEAR Non-static method error

weekly release 2.6dev

Merge branch 'install_master' of git://git.moodle.org/moodle-install

MDL-41623 rss: clean output rss content

MDL-41623 ensure all rss links are valid urls.

Automatically generated installer lang files

Automatically generated installer lang files

Merge branch 'master' into install_master

Merge branch 'install_master' of git://git.moodle.org/moodle-install

weekly release 2.6dev

Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle

MDL-41369 Behat tests updated because of fixed messaging navigation

MDL-40924 badges: added a print_error call to prevent PHP notices when no badges are found

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

MDL-41568 lang: Fix behat features after changes

MDL-41369 Pass viewing argument to more message screens

Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle

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

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

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

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

MDL-28579 scorm: Fix broken unit tests

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

MDL-41267 fix phpunit tests

Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

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

MDL-28579 SCORM: use filemanager instead of old file picker

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

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

MDL-41568 Merge English strings from the en_fix language pack

MDL-41395 Improved phpdocs for coursecatlib.php

MDL-41395 improved phpdoc's for coursecatlib.php

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

MDL-40566 behat: Update features using the new options

MDL-40566 behat: Adding info about the deprecated attr.

MDL-40566 behat: Moving from behat_command to behat_selectors

MDL-40566 behat: Adding behat_selectors

Class that manages moodle selectors transition
to behat default selectors.

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-28579 SCORM: coding guideline fixes

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.

Automatically generated installer lang files

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-41267 add support for subplugins in admin tools