Merge branch 'MDL-48441_profile_guest_28' of https://github.com/andyjdavis/moodle into MOODLE_28_STABLE

Andrew Nicols authored Nov 17, 2014 and Dan Poltawski committed Jan 05, 2015

I've also replaced other  occurrences of M.str with the correct use of
M.util.get_string() instead.

Merge branch 'MDL-48644_restoreLegacyLogs28' of https://github.com/moodlerooms/moodle into MOODLE_28_STABLE

Paul Nicholls authored Apr 28, 2014 and Frederic Massart committed Jan 02, 2015

The new is_msword() check should always return false for regular browsers.
It should return true for known MS Word, but false for known MS Outlook.

Paul Nicholls authored Apr 28, 2014 and Frederic Massart committed Jan 02, 2015

Basic detection for MS Word's internal link checker.  This is not perfect,
as older versions use IE6/7 user agent string with no identifying marks,
and newer versions don't necessarily identify themselves as Word (just as
Office).  Version information is not reliably available, even when there
is sufficient other information to identify it as Word's link checker.
This is also based on a small sample of Word / OS version pairings, so
there may be some which are identifiable but not currently covered.

Wrap long function definition
to next line.

Thanks to Miryan Salas for the patch.

Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php

Merge branch 'install_28_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_28_STABLE

Practice mode means the grades do not go to the gradebook, so do not
display the gradebook link at the end of the lesson