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

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

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-33569 theme_bootsrapbase: adding re-compiled style/moodle.css

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

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-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-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-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

weekly release 2.6dev

fix permissions

MDL-39653 enrol_imsenterprise: only mail admins on change

The existing beavhiour was sending useless emails to admins and
generating warnings.

Thanks to Matthew Orlando for the suggested fix.

ie9 svg compatibility fixes

MDL-35217 afterburner: applying orientations

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

Conflicts:
mod/scorm/db/upgrade.php

MDL-39910 SCORM: set correct site level defaults.

MDL-39910 SCORM: set correct site level defaults.

MDL-41995 calendar: changed the page layout for the export page

MDL-41989 Atto - Improving usability for non-touch devices

MDL-41962 events: Bumping plugin versions to update handlers

MDL-26408 enrol_imsenterprise: fix invalid component

MDL-41912 editor_atto: Padding for editable area

Revert "Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle"

This reverts commit 093a6fe77fc39b06c804fbe4bfcac9834a52c966, reversing
changes made to 88a4cb473439f5a2875260368b92fac1bb808c12.

MDL-12403 backup: prevent unset config from being applied

MDL-12403 backup: ability configure default for question bank excludes

MDL-12403 backup: configure question bank in automated backups

MDL-12403 backup: Ability to exclude question bank

Now users can choose to exclude the question bank from the backup,
this will in turn prevent any modules which use the question bank
from being included in the backup.

MDL-41885 modules now declare use of question bank

* FEATURE_USES_QUESTION_BANK is now a module_supports flag which declares
  that an activity uses the question engine.

* question_module_uses_questions can be used to determine if a module
  uses the question bank.

Revert "MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array)"

This reverts commit e89dfdbce62ad5be906cb2d822fa0f746cf6afd6.

Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle

Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle

Revert "MDL-39871 output: improved block manipulation inheritance"

This reverts commit eeb08203dce0131d3988a3707fbbf8563cd4bd30.

MDL-40811 JavaScript: Cast activityid to string when checking resources to show/hide

MDL-39910 mod_scorm: fix enable/disable navigation buttons

Merge branch 'int_uninstall' of https://github.com/skodak/moodle

MDL-39910 mod_scorm: fix enable/disable navigation buttons

Merge branch 'w39_MDL-41208_m26_yui312' of https://github.com/skodak/moodle

MDL-41437 inform developers that version column was removed from module and block tables

MDL-41437 fix some more forgotten module.version's

MDL-41437 refactor and cleanup module uninstall support

MDL-41437 implement new block, enrol and course format pluginfo uninstall methods

MDL-43437 fix course format disabling

MDL-41437 implement plugininfo_quiz necessary for quiz report uninstall

MDL-41437 fix non-functional message processor uninstall

MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings

MDL-41208 fix more invalid @VERSION@

MDL-41421 tool_generator: Fixing help text

- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together

MDL-41437 fix and cleanup filter uninstall

Merge branch 'MDL-40848_master' of git://github.com/totara/openbadges

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

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

Conflicts:
lib/editor/atto/styles.css

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

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

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

Conflicts:
lib/editor/atto/styles.css

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

MDL-41845 Activity Completion: Make default selection an option.

Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.

MDL-41421 tool_generator: Adding a CLI tool to generate the test plan