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

MDL-42091 atto - fixing on hover and active states of buttons

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

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

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

MDL-42020 course: performance improvement in course listings

- better performance when get_course_count() OR search_course_count() are called by themselves
- better performance in displaying course contacts

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

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

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

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

MDL-41940 files Fixes for behat tests

Commented out second test pending MDL-42013 visibiliy checking.

Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle

MDL-42054 fix incorrect email redirection in unit tests

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

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

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

MDL-42222 Assignment: Added type check before checking mimetype

Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype

MDL-40493 Question: Explain why setAdminUser is needed for tests

Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

Conflicts:
lib/db/upgrade.php
version.php

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

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

MDL-32188 fix type in question/engine/upgrade.txt

Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle

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

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

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

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

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

MDL-39776 Javascript - enable formautosubmit from a select box on android

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

MDL-40046 events: Use correct variable for page instance id

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

MDL-41993 Atto: Always clean/update the textarea when the content is changed

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

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

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

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

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

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

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

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

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

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

MDL-40493 question: set real $USER before testing question walktrough

MDL-41792 fix calendar test typos

Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle

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

MDL-16073 add test for connection to external database for authentication and enrolments

Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle

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

MDL-29663 forum: Replace constant FORUM_TRACKING_ON with FORUM_TRACKING_FORCED

Commit for MDL-29663 that renames the FORUM_TRACKING_ON constant
to FORUM_TRACKING_FORCED to allow easier and more consistant reading.

FORUM_TRACKING_ON retained but marked depreciated.

MDL-29663 forum: Option to allow Forced for read tracking.

Converts the use of Read Tracking On to Forced. Adds new admin setting
forum_allowforcedreadtracking. If set, Forced will be available when
adding or editing forums. In this state the forced forum overrides the
user preference of off.

With forum_allowforcedreadtracking not set (default) behavior is the
same as now, except forums previously set in the On state are treated
as Optional.

The side effect of forum_allowforcedreadtracking being on, is that users
cannot speed up the loading of course pages with lots of forums by
setting their personal forum read tracking option to off.

Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle

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

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

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

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

MDL-42199 fix course revision test

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

MDL-40053 events: Replace add_to_log() with new events in core_notes

MDL-40053 events: Write unit tests for note events

MDL-40053 events: write events for core_notes

Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed

MDL-40053 events: Generator for core_notes

Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle

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

MDL-40060 mod_book: Replace add_to_log with events

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

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

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

Merge branch 'MDL-38655' of git://github.com/aolley/moodle

Merge branch 'MDL-42122' of git://github.com/aolley/moodle

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

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

MDL-23692 login: Revert change to files copyright

Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

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

Conflicts:
lib/db/upgrade.php

MDL-41993 Atto: Strip yui ids from generated HTML.

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

Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle

Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle

MDL-41197 normalize ascii text conversion

Merge branch 'MDL-42188' of git://github.com/stronk7/moodle

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

Conflicts:
theme/bootstrapbase/style/moodle.css

MDL-42188 shifter: delete some orphaned files

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

Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle

MDL-42078 multiple uninstall improvements and cleanup

Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements

MDL-23692 forgotpw:adhere to site autocomp setting

MDL-31830 course: Remove unused shifter built js files

MDL-23692 forgotpw: Coding style tidyups.

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

Conflicts:
theme/bootstrapbase/style/moodle.css

MDL-38155 Enrolments: User can be suspended by bulk upload

Added ability to suspend user enrolment during bulk upload,
this can be done by setting enrolstatus field in csv file

MDL-31830 course: fixed up minor points as noted by Damyon's integration review

* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button

MDL-35926 notification dialog: trap tab focus within dialog modal.

Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle

MDL-31830 course: management behat tests corrected after fixes

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

Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle

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

Conflicts:
badges/assertion.php

MDL-42098 - mod_forum: Update webservice sql query to include all name fields.

Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle

Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

MDL-41398 output: implemented maintenance renderer