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

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

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

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

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

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

Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle

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

MDL-41288 Bugfix of error occuring when subwiki is not set

Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle

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

MDL-41562 file resource: fix page heading levels.

Also removing printheading options setting.

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

MDL-41567 url resource: fix page heading levels.

Also removing printheading options setting.

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

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

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

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

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

Revert "MDL-37028 Integrity check for course modules and sections"

This is failing unit tests.

This reverts commit 0bac49dc1983824e4861086ed1ab9e13af99d76d.
This reverts commit 1f0a9ce48b3e6f8c5dc6628aa692323909925032.

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

MDL-41237 Atto: Add missing js method docs.

MDL-41237 Atto - Adjusting the text styles for the editor

MDL-41235 fix whitespace

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

MDL-41235 atto - Matching the width of the html view to the wysiwyg view

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

MDL-41288 wiki: improve heading levels and styling

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

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

Conflicts:
theme/bootstrapbase/style/moodle.css

Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle

Merge branch 'MDL-41117_master' of git://github.com/kordan/moodle

MDL-21415 reports: Adding support of groups to course participation reports

Also introducing new api groups_allgroups_course_menu() that generates a selector for all groups in course"

MDL-23335 forum: Fix whitespace

Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle

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

MDL-41497 auth_db: Fix typo in lang string.

Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle

MDL-41436 Remove DB fields course.modinfo and sectioncache

MDL-41436 Allow user=-1 in get_fast_modinfo()

Remove ref to nonexisting course.modinfo in MNET auth, use get_fast_modinfo() for user=-1 instead

MDL-41436 Save extra DB query since 'enablecompletion' is cached

MDL-41436 Removing references to fields course.modinfo, sectioncache

Also add the field cacherev to the lists of default fields in course retrieval functions

MDL-41436 Move course content cache to MUC

added cache definition and DB field course.cacherev for cache validation

MDL-41436 implement new increment_revision_number() function

This is intended as a revision counter for local modinfo caching. It should be a lot more reliable and faster than doing it in PHP. Please note you need to invalidate all course caches after using this.

MDL-41219 course: Make properties of course_modinfo read-only

added phpdocs and unittests

MDL-41192 course: Added unittests for cm_info properties

MDL-41192 course: Added property-read cm_info::effectivegroupmode

MDL-41192 course: Properties of cm_info are read-only and calculated on request

Also added phpdocs

MDL-41192 course: Can not write to the read-only properties of cm_info

MDL-41218 Object section_info calculates expensive data on demand only

Added phpdocs and unittests, removed unnecessary fields such as course and userid because they can be retrieved from modinfo

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

Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle

Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle

Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle

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

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

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/upgrade.txt

Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle

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

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

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

NOBUG: fixed whitespace

MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch

With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.

Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

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

MDL-32862 backup: fixed missing global

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

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

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

MDL-41253 Restore: Mechanism to display progress during UI stages

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

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

MDL-40734 mod_glossary: cleaned up some headings

MDL-29378 Fix the recent string modification

But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.

Merge branch 'MDL-37804' of github.com:recreate/moodle

MDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean.

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

MDL-41438 version bump

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

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

MDL-18275 Calendar types: Add a major version + redirect for ci server fail.

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

Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle

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

MDL-41566 page resource: fix page heading levels.
Also removing printheading options setting.

MDL-41564 folder resource: fix page heading levels

MDL-40736 Survey: improve heading levels and styling

MDL-40686 book: fix heading level and styling

MDL-41438 core renderer: additional patch to remove .main definition from all core themes

MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.

With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.

Also added some notes in theme/upgrade.txt file.

MDL-41451 - formslib: use create_function instead of inline function

As per MDL-39432, closure-style inline functions can result in fatal
errors when using eAccelerator and thus should be avoided.

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

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

Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle

Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle

Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle

MDL-41189 fixed overflow issue with filepicker thumbnail

MDL-40347 Corrections to upgrade text

MDL-40347 grade/report/grader: cleaned up grade/report/grader/styles.css.

MDL-40347 grade/report/grader: Fixes: Grade report does not highlight some cells properly.

Squashed commit of the following:

commit 2c2164a7e27bd2b81102251420892386e39edecc
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 20 12:59:47 2013 +0100

    MDL-40347 theme: Modified upgrade.txt and created bootstrapbase/upgrade.txt.

commit 4449975a0f9249785ed152f63786bf7974c1776e
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 18:42:20 2013 +0100

    MDL-40347 grade/report/grader: added RTL css previously in bootstrapbase/less/moodle/grade.less to styles.css

commit b0af8f05a411b3dbb1d9c162a0d65c7f9c069c0f
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Aug 13 12:42:02 2013 +0100

    MDL-40347_M26 grade/report/grader: cleaned up grade/report/grader/styles.css.

commit 52627137dc662d47cbfdf023d056baf102f29d8a
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Jul 6 17:15:12 2013 +0100

    MDL-40347 grade/report/grader: Grade report does not highlight some cells properly.

    Merged/squashed original commit by Marina Glancy who:
    - added class 'i123' to each cell in the column
    - changed JS to highlight the cells with this class instead that cells with the column number
    - changed grade report css so the .vmarked and .hmarked classes have higher priority for all rows
    - made cells in 'average range' row td instead of th
    - little corrections to css: removed background image for some cells with .header css class
    - MyMobile theme disabled cells highlighting, make sure it disables it in all cases

    Merged/squashed original commit Mary Evans who:
    - removed theme/bootstrapbase/less/moodle/grade.less
    - removed @import "moodle/grade"; from bootstrapbase/less/moodle.less
    - removed reference to plugins_exclude_sheets for grader in both bootstrapbase/config.php and clean themes/config.php
    - commented out .hidden from bootstrapbase/less/bootstrap/responsive_utilities.less
    - made minor changes to grader/style.css

weekly release 2.6dev