Merge branch 'w50_MDL-37171_m24_outdatedexcel' of git://github.com/skodak/moodle into MOODLE_24_STABLE
MDL-36842 quiz: update accessrule upgrade.txt file in master.
MDL-35740 Assignment: Hide the number of assignment submissions for all students that was visible to all students through the activities block
MDL-35740 Assignment: Change the assignment index page to use a renderer.

This also cleans up the patch to prevent students from seeing the number of submissions for the assignment.
Merge branch 'MDL-30899_24' of git://github.com/dmonllao/moodle into MOODLE_24_STABLE
MDL-36259 course short names: ensure it displays when enabled in admin

Fixed 5 Moodle pages that does not display the course short name even if "Display extended course names" setting is on.  In fixing this, search.php also included related minor code to change to minimise DB calls to improve performance.
MDL-36259 - change case of table alias to match definition
Merge branch 'MDL-37014_webdav_folders_24' of git://github.com/davosmith/moodle into MOODLE_24_STABLE
MDL-36704: wrap pending conditions in span tags
MDL-36958 Forum: Replaced hard-coded numbers with proper defines
MDL-36339 Modify themes to add course headers and footers provided by course format
Merge branch 'w50_MDL-36245_m24_convert' of git://github.com/skodak/moodle into MOODLE_24_STABLE
MDL-35653 - mod/wiki: Force format now lets users edit wiki pages.

Thanks to Tõnis Tartes for part of this solution.

When force format was selected in the options, trying to view the
wiki would redirect to the front page with a message saying that
you do not have permission to edit this page. Students had no way
of viewing any entries or creating the first page.

When in force format it skips a page , which would be considered
uncessary for students, but this means that the group id is not set
and this is what is causing most of the problems.

I also have included a check to see if the title is default and whether
the user has permission to view all groups. In these situations the
intermediate page is displayed.
MDL-37220 course dndupload - improved 'add files' icon
MDL-37171 fix some more E_STRICT issues

Credit goes to Mark Nelson, thanks.
MDL-32245 question bank: update URL after moving question between categories.

Also, improve the URL when you go to edit the questions in a category.
Automatically generated installer lang files
Revert "MDL-36704: wrap pending conditions in span tags"

This reverts commit 5e9fd83df8f2c175681fa5a81d36df5ee313cb1e.
MDL-37015 Resource: link in onclick should not contain html special char
MDL-35833 - Blocks - Adding alt and title attributes to the docked-block panel close button