Merge branch 'MDL-30001' of git://github.com/jmvedrine/moodle

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

Merge branch 'MDL-41068' of https://github.com/mr-russ/moodle

Merge branch 'w33_MDL-41019_m26_langcaches' of https://github.com/skodak/moodle

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

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

Conflicts:
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css

MDL-22236 webservice upload files: Update unit tests

Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle

Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle

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

Conflicts:
version.php

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

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

Conflicts:
version.php

MDL-41019 improve language caching

Includes:
* no more hacky reloads, everything is written only once and kept until cache reset
* lang menu list is now cached in MUC
* both string and lang menu caches are compatible with local caches on cluster nodes
* config-dist.php cleanup

MDL-40044 Roles: Updated role_assigned and role_unassigned event to remove add_to_log

MDL-40044 Roles: Added role_allow_*_updated events to replace add_to_log on role allow page

Added events:
1. role_allow_assign_updated
2. role_allow_override_updated
3. role_allow_switch_updated

MDL-40044 Roles: Added role_capabilites_updated event and replaced related add_to_log

MDL-40044 Roles: Added role_deleted event and replaced related add_to_log

MDL-41086 rework detection of necessary upgrades

MDL-31487 fix FEATURE_CONTROLS_GRADE_VISIBILITY for quiz.

This is a followup to MDL-18301. That fix missed the following points:

1. On the edit categories and items screens, all items had an eye-con to
control the visibility, even if the visibility was controlled by the
module.

2. Changing the visibility of a grade category change the visibility of
all items within it, even if the visibility was controlled by the
module.

3. The quiz ingored $cm->visible when controlling whether its grade item
was visible.

MDL-41073 do not delete plugininfo caches when testing if upgrade necessary

This should help with performance for all users when admin is logged in
because these caches need to be purged only after upgrade.

MDL-41019 refactor string managers to new core_ classes

MDL-30001 WEBCT Import does not work for 2.0

weekly release 2.6dev

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

MDL-22236 webservice : Remove filearea restrictions on user draft areas.

It does not make sense to apply restrictions to the size of a users draft areas
so this is only checked if uploading direct to user private files.

MDL-22236 user webservice: add_user_private_files

Add webservice for adding files to user private files.

MDL-22236 Webservice file upload - Allow webservice file uploads direct to a draft filearea.

Via post to /webservice/upload.php

MDL-41068 profile: Repair profiling after box API change

The box API was used with an extra incorrect parameter
in the profiling code.  It worked without issue until
the introduction of error checking in MDL-40842.  It
has failed since then.

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

MDL-40662 block_course_overview: added addinstance capability string

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

Conflicts:
version.php

MDL-40934 core: Bump version requiring major upgrade

Automatically generated installer lang files

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

Conflicts:
lib/filestorage/file_storage.php

Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle

Conflicts:
lib/weblib.php

MDL-41023 weblib: improved coding style

MDL-40438 migrate all collatorlib:: and textlib:: uses

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

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

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

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

MDL-40682 MDL-41000 event name and description return strings

event description is non-localised string

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

MDL-41034 Additional check to be extra sure that no JS error occurs

Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle

MDL-40682 events: Add phpdocs for class and init method

MDL-40935 phpunit: Remove assertLegacyEventName() since get_legacy_eventname() is public now

MDL-40935 events: get_legacy_eventname() should be public and static

MDL-40086 file: Correct ordering of subdirectories

Thanks to Mohamed Alsharaf for the proposed solution.

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

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

Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle

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

Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle

Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle

Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle

Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle

Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle

MDL-27953 auth: documented the newly introduced function can_be_manually_set() in upgrade.txt

Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle

Conflicts:
lib/deprecatedlib.php

MDL-37962 core_message:reimplemented the beep on new message functionality from 1.9

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

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

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

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

Conflicts:
auth/tests/auth_test.php

NOBUG: fixed whitespace

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

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

Conflicts:
course/format/upgrade.txt

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

Automatically generated installer lang files

Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle

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

Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

Merge branch 'w32_MDL-40943_m26_observers' of https://github.com/skodak/moodle

MDL-41034 fix TinyMCE managefiles plugin for textareas that do not support file uploads

The current managefiles plugin assumes that every file manager will be created
by either calling use_editor without filepicker options ($fpoptions) or with
filepicker options that include options for the moodleimage plugin.

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

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

MDL-41029 core: Fix wrong guessing of course id in event base

MDL-40737 tool_uploadcourse: Prove that category equals to 0 is handled

MDL-40737 tool_uploadcourse: Prevent update of frontpage

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

MDL-40684 Fix conditional field name for custom user fields

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

Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle

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

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

MDL-30852 grade report: More coding guideline cleanups.

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

Merge branch 'MDL-35927' of git://github.com/rwijaya/moodle

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

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

Merge branch 'w32_MDL-40995_m26_minifyreworked' of https://github.com/skodak/moodle

Merge branch 'w32_MDL-41017_m26_purifier' of https://github.com/skodak/moodle

MDL-35981 comments: Fix for keyboard control of "add a comment"

MDL-36002 dragdrop: Add simulated event for keyboard drag drop.

This is to prevent any accidental state change in Y.DD.DDM.

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

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

MDL-34785 performance improvement with big list of courses

MDL-41025 moodlelib: addressed todo on truncate_userinfo

MDL-41024 lib: deprecate isediting