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

MDL-41912 Atto: Min-height fix - div was too small by default.

MDL-40050 webservice: Moving new events test file to right location

MDL-40050 webservice: Remove token from events

Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

MDL-41039 mod_quiz: version bump

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

Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle

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

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

MDL-40770 tinymce: fixed svg files included with moodle theme

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

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

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

Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle

MDL-40829: courses heading: remove headerblock class from header and fix heading levels.

    Also, changing h3 classname from name to categoryname.
    Added note to theme/upgrade.txt to describe the heading level changes.

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

Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle

Merge branch 'mdl41996-master' of https://github.com/tlock/moodle

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

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

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

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

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

Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle

Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle

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

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

MDL-41999 fix setting of USER in chat

MDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean)

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

MDL-41398 bootstrap: added a maintenance layout

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

MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)

MDL-41828 mod: fixed navbar when adding modules to a course

MDL-41900 events: avoid new debug call within unit tests

MDL-41878 JavaScript: Add an alias for Moodle in the YUI loader

MDL-40049 mod_choice: Replaced old add_to_log calls with event triggers.

Also added a generator for unit tests.

MDL-40047 chat: Fix classname typo in generator tests

MDL-40047 events: Replace add_to_logs with new events in feedback

MDL-40047 events: Add unit tests for feedback events

MDL-40047 feedback: Add a test generator for feedback

MDL-40047 events: Add events related to feedback responses

Adding following events related to feedback responses:-
/mod_feedback/event/response_deleted
/mod_feedback/event/response_submitted
/mod_feedback/event/instances_list_viewed
/mod_feedback/event/course_module_viewed

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

Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle

Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle

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

Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js

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

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

Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle

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

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

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

Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle

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

MDL-41988 behat: improvements to spin

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

Conflicts:
theme/bootstrapbase/style/moodle.css

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

Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle

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

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

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

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

Conflicts:
mod/upgrade.txt

MDL-40248 mod: Allow xxx_get_types() to use default display

* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt

Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle

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

Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

Conflicts:
course/yui/toolboxes/toolboxes.js

NOBUG fixed up whitespace

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

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

Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle

NOBUG: rebuilt bootstrap CSS

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

Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle

MDL-41997 cache: dummy store now uses static acceleration for session + request

MDL-41997 cache: added unit tests for disabled stores

MDL-41738 added web service function mod_assign_set_user_flags

MDL-42017 theme_afterburner: Additional improvements to make afterburner fully responsive.

MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css

MDL-33569 themes: Labels create extra margin below content.

MDL-41751 changes to api of question_response_analyser

and code refactoring and clean up.

MDL-16464 remove multichoice answers field.

This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.

At the same time, rename tables and columns to match the coding
guidelines.

MDL-41752 question statistics class moved and improved

quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.

MDL-41798 imscp module: fix heading levels.

MDL-41999 warn developers to not use $USER->password directly

MDL-41999 do not use $USER->password directly

MDL-41707 allow custom location of external test files used from unit tests

MDL-41942 course: Allow course listings to work with caches disabled

MDL-41176 do not set description and pw fields in $USER when editing own profile

MDL-41176 make sure fresh full user record is used when mailing email confirmation

MDL-41176 fix obvious bugs and typos in new user API

MDL-41921 mod_url: less restrictions on URL field

Restoring functionality from 2.4 accidentally removed in MDL-34311

MDL-41676 Corrected logic when to dim the activity name and content

MDL-32773 Add a help icon for button 'Set main file' in filemanager

MDL-41752 question statistics class moved and improved

quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.

MDL-41888 More comments

MDL-41888 allow for a blank string as format to mean not to show stat

as in MDL-41929 which applies to older stable branches.

MDL-41888 separate out quiz statistics calculations from report code

also code clean up.

MDL-33416 files: Remove unused reference fields in files table

Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync

MDL-42021 events: Debug message when objecttable set without an objectid