MDL-41213 filepicker: corrected outline of selected file dialogue

weekly release 2.6dev

Revert "MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor)"

This reverts commit 42fabe1e87da7eb9ca5e5f3414402a357babcc3e.

MDL-36002 dragdrop: Implement keyboard dragdrop for blocks

This is for the NEW block drag and drop code - not the other one :)
All it does it add proper drag handles.

Revert "MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function."

This reverts commit 492407e9f734989782e6380c381cfa14a09b1b26.

Revert "MDL-40931 useragent: separated user agent functionality into a lib"

This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

version.php

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

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

MDL-30839 Accessibility - Focusing on error on submit

MDL-41196 phpmailer: fixed unit test detection

Merge branch 'debugdeveloperbitwisemess' of git://github.com/skodak/moodle

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

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

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

MDL-41125 forum: Missing include of repository lib

MDL-30839 Fixing extra line breaks in error msg

MDL-39474 add set_debugging() tests

MDL-39474 fix incorrect bitwise ops when setting $CFG->debugdeveloper

MDL-39980 essay attempt-on-last. Handle the no-files case.

This slighly changes the format for the way answers are stroed in the DB
in the case where there is some HTML content, but no files. This should
not cause any problems.

Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle

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

MDL-30839 Fixing extra line breaks in error msg

MDL-41191 mod_forum: avoid DISTINCT on TEXT columns

It is not supported by all db engines

MDL-41191 add more test data to trigger duplicate course records

MDL-41057 csslib: Adding a version bump to clear css caches

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

Revert "MDL-39876 Change get_record('course') calls to get_course"

This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.

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

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

MDL-41143 course: Missing formslib required for constant use

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

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

Revert "MDL-39876 update_course_record function to update global COURSE"

This reverts commit c290ac5510ca06b3eae557c2165c2f106dde46aa.

Conflicts:
course/lib.php

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

MDL-36690 Do not cache objects inside course.modinfo as they may fail to serialize

convert moodle_url (all other fields are numbers or strings) to string before caching and then back to moodle_url when restoring.
Otherwise serialized modinfo can contain \0 byte which cause problems in Postgres DB

MDL-41040 event: Level property uses defined event constants

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

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

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

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

Conflicts:
course/lib.php

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

MDL-40931 useragent: converted useragent calls in ajaxenabled

Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings"

This reverts commit 0ef6f6860debcc2a5b67fecaeb57256377436b6b.

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

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

Conflicts:
theme/bootstrapbase/style/moodle.css

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

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

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

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

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

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

Conflicts:
version.php

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

MDL-41143 mod_forum: Prevent unnessary loading of formslib

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

Merge branch 'w33_MDL-41094_m26_purgecleanup' of https://github.com/skodak/moodle

MDL-40931 useragentlib: Removed unused class variable + version fix

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

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

Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle

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

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

Merge branch 'w33_MDL-40952_m26_opcacheunit' of https://github.com/skodak/moodle

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

MDL-39957 course: added missing assertions for events

This occurred when an add_to_log call, with no associated legacy event,
was replaced with a new event. We should still call assertEventLegacyData
even though there is no legacy event data to compare with, simply ensure
that the expected data was passed.

MDL-40038 files: Removed commented code from unit test

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

Conflicts:
files/tests/externallib_test.php

Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle

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

MDL-38197 tool_generator: fix use of raw LIKE sql

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

Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges

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

Conflicts:
course/tests/courselib_test.php
lang/en/moodle.php

MDL-39800 tags: moved cloud sorting to print function

MDL-39800 tags: Applied weight and ordering fix on all more page options

Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical

MDL-39800 tags: resolved weighting in block content

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

MDL-40043 Events API: Added user_loggedinas event to replace add_to_log

MDL-40043 Events API: Added course_section_updated event to replace add_to_log

Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle

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

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

Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle

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

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

Conflicts:
theme/bootstrapbase/style/moodle.css

Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

Conflicts:
lib/upgrade.txt

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

Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle

Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle

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

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

MDL-36002 keyboard drag drop: Hidden activities and labels

Get the correct title for hidden activities and labels.

Merge branch 'master_MDL-39572' of https://github.com/totara/moodle

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

Conflicts:
theme/bootstrapbase/style/moodle.css

Revert "MDL-41106 cache: several fixes for the session cache."

This reverts commit 89182546a0ae93a2aef79383bac902c77c7801f8.
This reverts commit 170b05362a82b2c1f5353551b7bd6fe4246fe951.
This reverts commit 2e9d5a534e8e3045923055baa1609d66cec0affe.

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

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

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

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

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

MDL-39770 mod_chat: improved the chat experience on small screens