MDL-30274 Correct typo of loginpage variable

Moodle release 2.2beta

Fix permissions

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

Automatically generated installer lang files

MDL-29956 ims-cc - whitespace cleanup

MDL-29956 ims-cc - disabling export and cleaning some unused code

This commits cleans some code (settings and dependencies)
and one file included previous by error.

Also it disables all the IMS-CC export feature by default, being
possible to enable it under demand by setting (@ config.php):

$CFG->enablebackupconverters = true;

Updated text conversion to read and store safe xml strings.

MDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210:17265)

Also implemented support for LTI icon during import.

MDL-29956: Implement export of Quiz activity (r16977, r17032)

MDL-29956: Implement common cartridge export (r16882)

MDL-29793 Advanced grading - do not execute the restore step if the grading.xml is missing

MDL-29793 Advanced grading backup - fixed the recently renamed DB field

MDL-27622 theme_mymobile: add it to core themes

Merge branch 'lti' of git://github.com/scriby/moodle

MDL-20534 lti: bump version and requires to current before integration, yay!

Merged MDL-29108 Advanced grading

Merge pull request #25 from marinaglancy/wip-nov14-rubric

MDL-27036 AICC HACP handling - add missing check for correct user with has_capability.

MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240

MDL-30241: fixing Javascript to work in IE as well

Merge branch 'MDL-28670' of git://github.com/nebgor/moodle

MDL-28670 webservice : (review) changes improving performance

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

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

MDL-30026 improve session lock - stronger detection for oracle

MDL-30026 improve session lock - mssql workaround for bug with scalar returned values

MDL-30026 improve session lock - unit tests & minor comment fixup

Automatically generated installer lang files

MDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid

As a response to Sam's review (7.4)

MDL-29108 Advanced grading - renaming DB fields formid to definitionid

As a response to Sam's review (7.1 and 7.3)

MDL-29108 Remove all associated grading areas when the context is being deleted

Automatically generated installer lang files

MDL-27622 theme_mymobile: whitespace fixes

MDL-20534 lti: A8. Removing locallib.php require from lib.php

MDL-20534 lti: Updating call to lti_add_instance with 2nd argument.

MDL-20534 lti: Fixing some language in lti's index.php

MDL-20534 lti: Getting rid of references to "Basic" LTI in language file

MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.

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

Added Moodle 1.9 -> Moodle 2 converter

MDL-29108 Orphaned areas are excluded from search results

If for any reason the referenced context does not exist any more, the
forms defined in relevant areas are considered removed (even if their
records still exist in the database).

MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level

MDL-29108 Do not display grading method selector for non-privileged users

The patch checks the required capability before it displays the grading
method selectors in the modform.

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

MDL-29945 incorrect logic when testing if a qtype can be uninstalled.

Thanks to Andrew Davis for catching this during testing.

MDL-29108 Improving get_grading_method() documentation

As a response to Sam's review (10)

MDL-29108 Fixing a typo

Spotted by Sam during the review (23)

MDL-29108 Removing global variables where they are not needed

Spotted by Sam during the review (17.1 and 17.3)

MDL-27622 theme_mymobile: quick regression fix of  var

Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

MDL-27037 wiki : fixed whitespace.

MDL-27037, wiki does not support visiblegroups functionality

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

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

Conflicts:
lib/db/upgrade.php
report/completion/index.php
report/progress/index.php
version.php

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

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

Conflicts:
theme/anomaly/style/general.css

Merged with some changes done with the introduction of
the new report plugins (MDL-29030)

MDL-29529 Assignment: Fix regression caused by MDL-27638

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

Conflicts:
theme/canvas/style/course.css

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

Conflicts:
question/type/upgrade.txt

There were already one just added upgrade.txt file so this ended
conflicting. Reviewed the contents, I've deleted the less detailed
note about pluginname, leaving the longer description added by Tim.

Ciao :-)

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

MDL-29808 qtypes: use standard pluginname strings and update version.php

AMOS BEGIN
 MOV [calculated,qtype_calculated],[pluginname,qtype_calculated]
 MOV [calculated_help,qtype_calculated],[pluginname_help,qtype_calculated]
 MOV [calculated_link,qtype_calculated],[pluginname_link,qtype_calculated]
 MOV [addingcalculated,qtype_calculated],[pluginnameadding,qtype_calculated]
 MOV [editingcalculated,qtype_calculated],[pluginnameediting,qtype_calculated]
 MOV [calculatedsummary,qtype_calculated],[pluginnamesummary,qtype_calculated]

 MOV [calculatedmulti,qtype_calculatedmulti],[pluginname,qtype_calculatedmulti]
 MOV [calculatedmulti_help,qtype_calculatedmulti],[pluginname_help,qtype_calculatedmulti]
 MOV [calculatedmulti_link,qtype_calculatedmulti],[pluginname_link,qtype_calculatedmulti]
 MOV [addingcalculatedmulti,qtype_calculatedmulti],[pluginnameadding,qtype_calculatedmulti]
 MOV [editingcalculatedmulti,qtype_calculatedmulti],[pluginnameediting,qtype_calculatedmulti]
 MOV [calculatedmultisummary,qtype_calculatedmulti],[pluginnamesummary,qtype_calculatedmulti]

 MOV [calculatedsimple,qtype_calculatedsimple],[pluginname,qtype_calculatedsimple]
 MOV [calculatedsimple_help,qtype_calculatedsimple],[pluginname_help,qtype_calculatedsimple]
 MOV [calculatedsimple_link,qtype_calculatedsimple],[pluginname_link,qtype_calculatedsimple]
 MOV [addingcalculatedsimple,qtype_calculatedsimple],[pluginnameadding,qtype_calculatedsimple]
 MOV [editingcalculatedsimple,qtype_calculatedsimple],[pluginnameediting,qtype_calculatedsimple]
 MOV [calculatedsimplesummary,qtype_calculatedsimple],[pluginnamesummary,qtype_calculatedsimple]

 MOV [description,qtype_description],[pluginname,qtype_description]
 MOV [description_help,qtype_description],[pluginname_help,qtype_description]
 MOV [addingdescription,qtype_description],[pluginnameadding,qtype_description]
 MOV [editingdescription,qtype_description],[pluginnameediting,qtype_description]
 MOV [descriptionsummary,qtype_description],[pluginnamesummary,qtype_description]

 MOV [essay,qtype_essay],[pluginname,qtype_essay]
 MOV [essay_help,qtype_essay],[pluginname_help,qtype_essay]
 MOV [essay_link,qtype_essay],[pluginname_link,qtype_essay]
 MOV [addingessay,qtype_essay],[pluginnameadding,qtype_essay]
 MOV [editingessay,qtype_essay],[pluginnameediting,qtype_essay]
 MOV [essaysummary,qtype_essay],[pluginnamesummary,qtype_essay]

 MOV [match,qtype_match],[pluginname,qtype_match]
 MOV [match_help,qtype_match],[pluginname_help,qtype_match]
 MOV [match_link,qtype_match],[pluginname_link,qtype_match]
 MOV [addingmatch,qtype_match],[pluginnameadding,qtype_match]
 MOV [editingmatch,qtype_match],[pluginnameediting,qtype_match]
 MOV [matchsummary,qtype_match],[pluginnamesummary,qtype_match]

 MOV [missingtype,qtype_missingtype],[pluginname,qtype_missingtype]
 MOV [addingmissingtype,qtype_missingtype],[pluginnameadding,qtype_missingtype]
 MOV [editingmissingtype,qtype_missingtype],[pluginnameediting,qtype_missingtype]

 MOV [multianswer,qtype_multianswer],[pluginname,qtype_multianswer]
 MOV [multianswer_help,qtype_multianswer],[pluginname_help,qtype_multianswer]
 MOV [multianswer_link,qtype_multianswer],[pluginname_link,qtype_multianswer]
 MOV [addingmultianswer,qtype_multianswer],[pluginnameadding,qtype_multianswer]
 MOV [editingmultianswer,qtype_multianswer],[pluginnameediting,qtype_multianswer]
 MOV [multianswersummary,qtype_multianswer],[pluginnamesummary,qtype_multianswer]

 MOV [multichoice,qtype_multichoice],[pluginname,qtype_multichoice]
 MOV [multichoice_help,qtype_multichoice],[pluginname_help,qtype_multichoice]
 MOV [multichoice_link,qtype_multichoice],[pluginname_link,qtype_multichoice]
 MOV [addingmultichoice,qtype_multichoice],[pluginnameadding,qtype_multichoice]
 MOV [editingmultichoice,qtype_multichoice],[pluginnameediting,qtype_multichoice]
 MOV [multichoicesummary,qtype_multichoice],[pluginnamesummary,qtype_multichoice]

 MOV [numerical,qtype_numerical],[pluginname,qtype_numerical]
 MOV [numerical_help,qtype_numerical],[pluginname_help,qtype_numerical]
 MOV [numerical_link,qtype_numerical],[pluginname_link,qtype_numerical]
 MOV [addingnumerical,qtype_numerical],[pluginnameadding,qtype_numerical]
 MOV [editingnumerical,qtype_numerical],[pluginnameediting,qtype_numerical]
 MOV [numericalsummary,qtype_numerical],[pluginnamesummary,qtype_numerical]

 MOV [random,qtype_random],[pluginname,qtype_random]
 MOV [random_help,qtype_random],[pluginname_help,qtype_random]
 MOV [editingrandom,qtype_random],[pluginnameediting,qtype_random]

 MOV [shortanswer,qtype_shortanswer],[pluginname,qtype_shortanswer]
 MOV [shortanswer_help,qtype_shortanswer],[pluginname_help,qtype_shortanswer]
 MOV [shortanswer_link,qtype_shortanswer],[pluginname_link,qtype_shortanswer]
 MOV [addingshortanswer,qtype_shortanswer],[pluginnameadding,qtype_shortanswer]
 MOV [editingshortanswer,qtype_shortanswer],[pluginnameediting,qtype_shortanswer]
 MOV [shortanswersummary,qtype_shortanswer],[pluginnamesummary,qtype_shortanswer]

 MOV [truefalse,qtype_truefalse],[pluginname,qtype_truefalse]
 MOV [truefalse_help,qtype_truefalse],[pluginname_help,qtype_truefalse]
 MOV [truefalse_link,qtype_truefalse],[pluginname_link,qtype_truefalse]
 MOV [addingtruefalse,qtype_truefalse],[pluginnameadding,qtype_truefalse]
 MOV [editingtruefalse,qtype_truefalse],[pluginnameediting,qtype_truefalse]
 MOV [truefalsesummary,qtype_truefalse],[pluginnamesummary,qtype_truefalse]
AMOS END

MDL-29808 qformats: use standard pluginname string and add version.php

AMOS BEGIN
 MOV [aiken,qformat_aiken],[pluginname,qformat_aiken]
 MOV [aiken_help,qformat_aiken],[pluginname_help,qformat_aiken]
 MOV [aiken_link,qformat_aiken],[pluginname_link,qformat_aiken]
 MOV [blackboard,qformat_blackboard],[pluginname,qformat_blackboard]
 MOV [blackboard_help,qformat_blackboard],[pluginname_help,qformat_blackboard]
 MOV [blackboard_six,qformat_blackboard_six],[pluginname,qformat_blackboard_six]
 MOV [blackboard_six_help,qformat_blackboard_six],[pluginname_help,qformat_blackboard_six]
 MOV [examview,qformat_examview],[pluginname,qformat_examview]
 MOV [examview_help,qformat_examview],[pluginname_help,qformat_examview]
 MOV [gift_help,qformat_gift],[pluginname_help,qformat_gift]
 MOV [gift_link,qformat_gift],[pluginname_link,qformat_gift]
 MOV [learnwise,qformat_learnwise],[pluginname,qformat_learnwise]
 MOV [learnwise_help,qformat_learnwise],[pluginname_help,qformat_learnwise]
 MOV [missingword,qformat_missingword],[pluginname,qformat_missingword]
 MOV [missingword_help,qformat_missingword],[pluginname_help,qformat_missingword]
 MOV [missingword_link,qformat_missingword],[pluginname_link,qformat_missingword]
 MOV [multianswer,qformat_multianswer],[pluginname,qformat_multianswer]
 MOV [multianswer_help,qformat_multianswer],[pluginname_help,qformat_multianswer]
 MOV [multianswer_link,qformat_multianswer],[pluginname_link,qformat_multianswer]
 MOV [webct_help,qformat_webct],[pluginname_help,qformat_webct]
 MOV [webct_link,qformat_webct],[pluginname_link,qformat_webct]
 MOV [xhtml,qformat_xhtml],[pluginname,qformat_xhtml]
 MOV [xhtml_help,qformat_xhtml],[pluginname_help,qformat_xhtml]
 MOV [xhtml_link,qformat_xhtml],[pluginname_link,qformat_xhtml]
 MOV [xml_help,qformat_xml],[pluginname_help,qformat_xml]
 MOV [xml_link,qformat_xml],[pluginname_link,qformat_xml]
AMOS END

MDL-29808 qbehaviours: update to use ->dependencies in version.php

MDL-29945 plugin management: don't show Uninstall links for required plugins.

MDL-28277 scorm report - set interaction as standard + version component

Merge branch 'MDL-30027' of git://github.com/mouneyrac/moodle

Merge branch 'MDL-30043' of git://github.com/mouneyrac/moodle

Merge branch 'MDL-29931' of git://github.com/mouneyrac/moodle

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

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

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

Merge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle

Merge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle

Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

MDL-29798 Final clean-up before submitting for the integration review

Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle

Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle

NOBUG: Whitespace fixes

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

Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle

Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle

MDL-29656 Fix bad string reference

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

MDL-28277 Changing optional_param to optional_param_array

MDL-29696 mod/data - fixed page continuing after footer.

MDL-29722 - No default guest enrol instance for requested courses

Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle

MDL-27622 theme_mymobile: Pre-integration clean up

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

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

MDL-29812 partcipiant report - breaks when filtering by user

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

MDL-25511-theme_canvas tidy up CORE css files

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

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

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

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

MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes

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