Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle

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

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

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

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

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

MDL-25937 Forms Library: Filepicker will respect disable if

MDL-26486 Lesson : fixed whitespace

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

MDL-27640 rating: altered the return url provided by mod_data to ratings

MDL-29541 Administration : fixed whitespace

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

MDL-29244 users: Fixed comments for checkbox.php

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

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

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

MDL-28566 theme_base: removed MDL comment

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

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

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

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

Merge commit 'FETCH_HEAd'

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

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

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

Merge branch 'MDL-29612' of git://github.com/stronk7/moodle.git with typo cleanup

Merge branch 'w39_MDL-29555_m22_yui341' of git://github.com/skodak/moodle

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

Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle

MDL-29618 backup - back to handling enrolments properly. Regession of MDL-26841, my fault, grrr

MDL-29612 xmldb editor - fix recent regression + prevent unsigned floats and numbers

MDL-29611 xmldb editor - comments and whitespace cleanup

MDL-29605-modify Afterburner menu to allow auto format

MDL-29216 multianswer qtype needs intereactive elements on the form.

MDL-29341 qtype numerical/calc: display of mc units badly laid out.

MDL-27295 Course Category View - Only display count when more than 0 courses

MDL-29403 fix  for master

MDL-29558 question preview: limit variants drop-down to the first 100

In situations when question has many variants.

MDL-29323-FIX invalid border style

MDL-29511 cannot review previous steps of a question attempt since MDL-28679.

MDL-29511 Fix problems on the quiz review questions page found while investigating this bug.

MDL-25454: using the faster way to check if record exists in db

MDL-29570 Quiz editing page displays the wrong time in the status line sometimes.

MDL-29555 import YUI 3.4.1

To be backported to 2.1 stable soon.

MDL-28725 wiki: added urlencode around the section variable when it is being used to construct URLs

MDL-28725 wiki: added missing string
AMOS BEGIN
 CPY [invalidsection,core_admin],[invalidsection,mod_wiki]
AMOS END

MDL-25937 Froms Library: Added server side validation for filepicker and filemanager

MDL-29539 HTML Editor: Fixed XHTML formatting for editor

MDL-25454 before skipping course backup make sure that there are no change entries in it's log during the last month. Store the nextstarttime even for courses that were not backed up

MDL-29567 postgresql - handle negative defaults in numerical cols properly

MDL-29567 unit tests - add some tests to cover negative defaults in numerical cols

MDL-29566 mysql - length / decimal specs in float columns are optional

MDL-29566 unit tests - add some tests to cover get_columns() with number/float columns

MDL-28566 - Fix for participants user details

MDL-29552 themes - show the name of the picked theme when working with device detection enabled

weekly release 2.2dev

Merge branch 'install_master' of git://github.com/amosbot/moodle

MDL-26486 lesson mod: fixed grade report error on matching and shortanswers questions

Automatically generated installer lang files

Merge branch 'w38_MDL-29533_m22_yui341pr1' of git://github.com/skodak/moodle

MDL-29533 add skins

MDL-29533 fresh build fetched from cdn

MDL-29504 plugin_callback() - undelete global $CFG that was supposed to be unused

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

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

MDL-29244 Users: Fixed filter for selecting users who never logged in and course roles dropdown show all revelent roles

Merge branch 'MDL-25241_forum_search_ratings' of git://github.com/andyjdavis/moodle

Merge branch 'w38_MDL-29510_m22_orglang' of git://github.com/skodak/moodle

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

MDL-29504 plugin_callback() - delete some unused code

Merge branch 'w38_MDL-29509_m22_admintool2' of git://github.com/skodak/moodle

Merge branch 'w38_MDL-29504_m22_plugincallback' of git://github.com/skodak/moodle

Merge branch 'MDL-28686' of git://github.com/bostelm/moodle

MDL-29509 fix maturity flag

MDL-29509 fix customlang upgrade script

MDL-29509 fix small docs typos

MDL-29509 use appropriate requires and consistent versions for all admin tools

MDL-29509 migrate DB replace to admin tools

MDL-29509 new admin tool manager UI

MDL-29509 remove dangerous and obsolete dataroot purge script

The problem is that we would have to purge files table too, but in any case this is absolutely forbidden for production sites. People have to use command line deleting on dev sites, sorry.

MDL-29509 new dbperf tool will have to be implemented from scratch

MDL-29509 move timezoneimport to admin tools

AMOS BEGIN
 MOV [configintrotimezones,core_admin],[configintrotimezones,tool_timezoneimport]
 MOV [importtimezones,core_admin],[importtimezones,tool_timezoneimport]
 MOV [importtimezonescount,core_admin],[importtimezonescount,tool_timezoneimport]
 MOV [importtimezonesfailed,core_admin],[importtimezonesfailed,tool_timezoneimport]
 MOV [updatetimezones,core_admin],[updatetimezones,tool_timezoneimport]
AMOS END

MDL-29509 move spamcleaner to admin tools

Why? Because this tool does not support contexts, allows data modifications and is intended only for admins. It is still linked from admin reports for now, we will move it elsewhere once we know where to add general new reports.

AMOS BEGIN
 MOV [pluginname,report_spamcleaner],[pluginname,tool_spamcleaner]
 MOV [spamauto,report_spamcleaner],[spamauto,tool_spamcleaner]
 MOV [spamcannotdelete,report_spamcleaner],[spamcannotdelete,tool_spamcleaner]
 MOV [spamcannotfinduser,report_spamcleaner],[spamcannotfinduser,tool_spamcleaner]
 MOV [spamcleanerintro,report_spamcleaner],[spamcleanerintro,tool_spamcleaner]
 MOV [spamdeleteall,report_spamcleaner],[spamdeleteall,tool_spamcleaner]
 MOV [spamdeleteallconfirm,report_spamcleaner],[spamdeleteallconfirm,tool_spamcleaner]
 MOV [spamdeleteconfirm,report_spamcleaner],[spamdeleteconfirm,tool_spamcleaner]
 MOV [spamdesc,report_spamcleaner],[spamdesc,tool_spamcleaner]
 MOV [spameg,report_spamcleaner],[spameg,tool_spamcleaner]
 MOV [spamfromblog,report_spamcleaner],[spamfromblog,tool_spamcleaner]
 MOV [spaminvalidresult,report_spamcleaner],[spaminvalidresult,tool_spamcleaner]
 MOV [spamoperation,report_spamcleaner],[spamoperation,tool_spamcleaner]
 MOV [spamresult,report_spamcleaner],[spamresult,tool_spamcleaner]
 MOV [spamsearch,report_spamcleaner],[spamsearch,tool_spamcleaner]
AMOS END

MDL-29509 move qeupgradehelper to admin tools

AMOS BEGIN
 MOV [action,local_qeupgradehelper],[action,tool_qeupgradehelper]
 MOV [alreadydone,local_qeupgradehelper],[alreadydone,tool_qeupgradehelper]
 MOV [areyousure,local_qeupgradehelper],[areyousure,tool_qeupgradehelper]
 MOV [areyousuremessage,local_qeupgradehelper],[areyousuremessage,tool_qeupgradehelper]
 MOV [areyousureresetmessage,local_qeupgradehelper],[areyousureresetmessage,tool_qeupgradehelper]
 MOV [attemptstoconvert,local_qeupgradehelper],[attemptstoconvert,tool_qeupgradehelper]
 MOV [backtoindex,local_qeupgradehelper],[backtoindex,tool_qeupgradehelper]
 MOV [conversioncomplete,local_qeupgradehelper],[conversioncomplete,tool_qeupgradehelper]
 MOV [convertattempts,local_qeupgradehelper],[convertattempts,tool_qeupgradehelper]
 MOV [convertquiz,local_qeupgradehelper],[convertquiz,tool_qeupgradehelper]
 MOV [convertedattempts,local_qeupgradehelper],[convertedattempts,tool_qeupgradehelper]
 MOV [cronenabled,local_qeupgradehelper],[cronenabled,tool_qeupgradehelper]
 MOV [croninstructions,local_qeupgradehelper],[croninstructions,tool_qeupgradehelper]
 MOV [cronprocesingtime,local_qeupgradehelper],[cronprocesingtime,tool_qeupgradehelper]
 MOV [cronsetup,local_qeupgradehelper],[cronsetup,tool_qeupgradehelper]
 MOV [cronsetup_desc,local_qeupgradehelper],[cronsetup_desc,tool_qeupgradehelper]
 MOV [cronstarthour,local_qeupgradehelper],[cronstarthour,tool_qeupgradehelper]
 MOV [cronstophour,local_qeupgradehelper],[cronstophour,tool_qeupgradehelper]
 MOV [extracttestcase,local_qeupgradehelper],[extracttestcase,tool_qeupgradehelper]
 MOV [extracttestcase_desc,local_qeupgradehelper],[extracttestcase_desc,tool_qeupgradehelper]
 MOV [gotoindex,local_qeupgradehelper],[gotoindex,tool_qeupgradehelper]
 MOV [gotoquizreport,local_qeupgradehelper],[gotoquizreport,tool_qeupgradehelper]
 MOV [gotoresetlink,local_qeupgradehelper],[gotoresetlink,tool_qeupgradehelper]
 MOV [includedintheupgrade,local_qeupgradehelper],[includedintheupgrade,tool_qeupgradehelper]
 MOV [invalidquizid,local_qeupgradehelper],[invalidquizid,tool_qeupgradehelper]
 MOV [listpreupgrade,local_qeupgradehelper],[listpreupgrade,tool_qeupgradehelper]
 MOV [listpreupgrade_desc,local_qeupgradehelper],[listpreupgrade_desc,tool_qeupgradehelper]
 MOV [listpreupgradeintro,local_qeupgradehelper],[listpreupgradeintro,tool_qeupgradehelper]
 MOV [listtodo,local_qeupgradehelper],[listtodo,tool_qeupgradehelper]
 MOV [listtodo_desc,local_qeupgradehelper],[listtodo_desc,tool_qeupgradehelper]
 MOV [listtodointro,local_qeupgradehelper],[listtodointro,tool_qeupgradehelper]
 MOV [listupgraded,local_qeupgradehelper],[listupgraded,tool_qeupgradehelper]
 MOV [listupgraded_desc,local_qeupgradehelper],[listupgraded_desc,tool_qeupgradehelper]
 MOV [listupgradedintro,local_qeupgradehelper],[listupgradedintro,tool_qeupgradehelper]
 MOV [noquizattempts,local_qeupgradehelper],[noquizattempts,tool_qeupgradehelper]
 MOV [nothingupgradedyet,local_qeupgradehelper],[nothingupgradedyet,tool_qeupgradehelper]
 MOV [notupgradedsiterequired,local_qeupgradehelper],[notupgradedsiterequired,tool_qeupgradehelper]
 MOV [numberofattempts,local_qeupgradehelper],[numberofattempts,tool_qeupgradehelper]
 MOV [oldsitedetected,local_qeupgradehelper],[oldsitedetected,tool_qeupgradehelper]
 MOV [outof,local_qeupgradehelper],[outof,tool_qeupgradehelper]
 MOV [pluginname,local_qeupgradehelper],[pluginname,tool_qeupgradehelper]
 MOV [pretendupgrade,local_qeupgradehelper],[pretendupgrade,tool_qeupgradehelper]
 MOV [pretendupgrade_desc,local_qeupgradehelper],[pretendupgrade_desc,tool_qeupgradehelper]
 MOV [questionsessions,local_qeupgradehelper],[questionsessions,tool_qeupgradehelper]
 MOV [quizid,local_qeupgradehelper],[quizid,tool_qeupgradehelper]
 MOV [quizupgrade,local_qeupgradehelper],[quizupgrade,tool_qeupgradehelper]
 MOV [quizzesthatcanbereset,local_qeupgradehelper],[quizzesthatcanbereset,tool_qeupgradehelper]
 MOV [quizzestobeupgraded,local_qeupgradehelper],[quizzestobeupgraded,tool_qeupgradehelper]
 MOV [quizzeswithunconverted,local_qeupgradehelper],[quizzeswithunconverted,tool_qeupgradehelper]
 MOV [resetquiz,local_qeupgradehelper],[resetquiz,tool_qeupgradehelper]
 MOV [resetcomplete,local_qeupgradehelper],[resetcomplete,tool_qeupgradehelper]
 MOV [resettingquizattempts,local_qeupgradehelper],[resettingquizattempts,tool_qeupgradehelper]
 MOV [resettingquizattemptsprogress,local_qeupgradehelper],[resettingquizattemptsprogress,tool_qeupgradehelper]
 MOV [upgradingquizattempts,local_qeupgradehelper],[upgradingquizattempts,tool_qeupgradehelper]
 MOV [upgradedsitedetected,local_qeupgradehelper],[upgradedsitedetected,tool_qeupgradehelper]
 MOV [upgradedsiterequired,local_qeupgradehelper],[upgradedsiterequired,tool_qeupgradehelper]
 MOV [veryoldattemtps,local_qeupgradehelper],[veryoldattemtps,tool_qeupgradehelper]
AMOS END

MDL-29509 move customlang to admin tools

AMOS BEGIN
 MOV [checkin,report_customlang],[checkin,tool_customlang]
 MOV [checkout,report_customlang],[checkout,tool_customlang]
 MOV [checkoutdone,report_customlang],[checkoutdone,tool_customlang]
 MOV [checkoutinprogress,report_customlang],[checkoutinprogress,tool_customlang]
 MOV [confirmcheckin,report_customlang],[confirmcheckin,tool_customlang]
 MOV [customlang:edit,report_customlang],[customlang:edit,tool_customlang]
 MOV [customlang:view,report_customlang],[customlang:view,tool_customlang]
 MOV [filter,report_customlang],[filter,tool_customlang]
 MOV [filtercomponent,report_customlang],[filtercomponent,tool_customlang]
 MOV [filtercustomized,report_customlang],[filtercustomized,tool_customlang]
 MOV [filtermodified,report_customlang],[filtermodified,tool_customlang]
 MOV [filteronlyhelps,report_customlang],[filteronlyhelps,tool_customlang]
 MOV [filtershowstrings,report_customlang],[filtershowstrings,tool_customlang]
 MOV [filterstringid,report_customlang],[filterstringid,tool_customlang]
 MOV [filtersubstring,report_customlang],[filtersubstring,tool_customlang]
 MOV [headingcomponent,report_customlang],[headingcomponent,tool_customlang]
 MOV [headinglocal,report_customlang],[headinglocal,tool_customlang]
 MOV [headingstandard,report_customlang],[headingstandard,tool_customlang]
 MOV [headingstringid,report_customlang],[headingstringid,tool_customlang]
 MOV [markinguptodate,report_customlang],[markinguptodate,tool_customlang]
 MOV [markinguptodate_help,report_customlang],[markinguptodate_help,tool_customlang]
 MOV [markuptodate,report_customlang],[markuptodate,tool_customlang]
 MOV [modifiedno,report_customlang],[modifiedno,tool_customlang]
 MOV [modifiednum,report_customlang],[modifiednum,tool_customlang]
 MOV [nostringsfound,report_customlang],[nostringsfound,tool_customlang]
 MOV [placeholder,report_customlang],[placeholder,tool_customlang]
 MOV [placeholder_help,report_customlang],[placeholder_help,tool_customlang]
 MOV [placeholderwarning,report_customlang],[placeholderwarning,tool_customlang]
 MOV [pluginname,report_customlang],[pluginname,tool_customlang]
 MOV [savecheckin,report_customlang],[savecheckin,tool_customlang]
 MOV [savecontinue,report_customlang],[savecontinue,tool_customlang]
AMOS END

MDL-29509 explain registration url trouble

The problem is that the registration does not pass the confirmation url together with the registration request, this means we can not move the admin/registration to admin/tool/registration, but also sites with custom $CFG->admin can not be registered either.

MDL-29509 add cron support for admin tools

MDL-29504 fix invalid plugin callback names

Only modules are allow to use old style non-frankenstyle callback names, all other plugins must use full component prefix.

Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes

Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle

MDL-29401 few more tests for Eloy

MDL-29401 fix previous regression

The problem was introduced when / was removed from PARAM_ALPHAEXT.

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

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

Merge branch 'w38_MDL-29533_m22_yui341pr1' of git://github.com/skodak/moodle

MDL-29533 import new YUI 3.4.1pr1

We need to test this in master because we need to backport it into Moodle 2.1.x in order to resolve issues with latest browsers.

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

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

MDL-29528 qtype multichoice and caclulated combined feedback format overwritten during upgrade.

Merge branch 'MDL-29270-question-grade' of git://github.com/mudrd8mz/moodle