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

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

MDL-27622 theme_mymobile: whitespace fixes

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

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-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

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

MDL-29803 report/logs - don't retrieve all users uncessarily

Also remove uncessary retrieval of idnumber

Helps display the main logs page on large sites without running out of
memory

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

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

Merge branch 'wip-mdl-27521-master' of git://github.com/phalacee/moodle

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

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

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

MDL-27790 Backup: Added warning message to let user know that temporary course will be created for restoration process

MDL-27790 Backup: temperory course will be deleted in case of exception and cancellation of restore process

MDL-30154 Repositories : fixed whitespace.

Merge branch 'MDL-30154_master_wip' of git://github.com/grabs/moodle

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

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

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

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

MDL-30175 cm_info - add support to external url icon images

MDL-30135 question formats: trans_format/get_format should be public.

They need to be used by third-party qtype developers.

MDL-27542 calendar export: fixed the following:
1. changing auth token to use user id instead of username
2. add fall back checking for old url
3. remove yui functionality to generate calendar url
4. add missing variable
5. fixed usercontext instance

MDL-29030 add block page type upgrade

MDL24200 - Admin Users - Changing the submit button to just a button to prevent it from taking focus when entering text. (Patch provided by Hubert Chathi)

MDL-28670 webservice : added dimming of service name in security keys page if webservice is disabled or not on authorised list to access webservice.

MDL-30158 Questions Cleaning up blackboard/format.php

MDL-30059: Assignment Submission Notification Should Use Teacher's Timezone Rather Than Server Time

SCORM MDL-27036 increase sessid, improve lang strings

MDL-28292 block_html: white space fix

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

MDL-29864 minify: Added a link to upstream issue being patched

Merge branch 'MDL-29864-master-2' of git://git.luns.net.uk/moodle

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

MDL-30154 - WebDAV-Repository fails on some WebDAV-Server

MDL-30010FIX for pagelayout problems when moving blocks

MDL-30151 finally remove mod/forum:initialsubscriptions and improve perf

The 'mod/forum:initialsubscriptions' was introduced in 1.7 as a workaround for missing enrolment info - the mod_form forum help was not even updated to mention this capability. Now that we have reliable enrolment info we can significantly improve both enrol and unenrol performance. Hopefully majority of users will not miss this capability...

MDL-30026 improve session lock acquire timeouts and other minor cleanup

This is partially based on original patch by Tony Levi.

MDL-29030 add report management UI

MDL-29030 add pagetype names

MDL-29030 fix report_log paging

MDL-29030 move user completion reporting to report_completion plugin

MDL-29030 move user stats reporting to report_stats plugin