MDL-44014 Navigation: Set the correct context when retrieved via AJAX
Merge remote-tracking branch 'upstream/MOODLE_26_STABLE' into MOODLE_26_STABLE
 MDL-45245 html_writer::select_time does not respect 5th parameter "attributes"
MDL-23566 mod_lesson: Float answers so paragraphs line up correctly next to the inputs
MDL-45432 mod_assign Declare character encoding in onlinetext export

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue
MDL-45469 Conditional availability: Restrict by text area broken

It has never worked, because the data for text area fields is not
loaded into the $USER object.

Changing it so that the dropdown list does not include these types
of field. (This 2.6 version of change is similar to the 2.7 code
but in a different location and without unit test.)
Automatically generated installer lang files
Automatically generated installer lang files
Moodle release 2.6.3
Automatically generated installer lang files
Automatically generated installer lang files
MDL-45483 mod_forum: corrects values for maxattachments in forum settings
MDL-45514 behat: Fixed should_not_exist timout param
MDL-45496 core Added space to logged in as line
MDL-45380 theme_bootstrapbase: Restore config override highlight

Conflicts:

	theme/bootstrapbase/less/moodle/admin.less
	theme/bootstrapbase/style/moodle.css
MDL-45135 mod_glossary: fix RTL alignment of table

Tablelib has a specific 'hook' to allow alignment to be corrected for
RTL languages, but needs to be specified direction in lowercase.
Merge remote-tracking branch 'moodle/MOODLE_26_STABLE' into MOODLE_26_STABLE
MDL-32543 (backport) Make sure the action and url fields of log table have correct sizes
MDL-45512 comments: Added full date to comment details.