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

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

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.

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

SCORM MDL-30146 AICC - add ability to link direct to a simple AICC url

SCORM MDL-27036 enable AICC HACP

MDL-30137 question engine: Ugglify the SQL to appease MS SQL server.

MDL-29977 MNet does not allow to start a remote session when masquerading as another user

MDL-28277 SCORM optimising function get_scorm_question_count

SCORM MDL-29159 - override getContentHtml function in treeview so that it doesn't escape text incorrectly

MDL-30021 qtype numerical better showunits default when coming from 1.9

This applies to:
1. Upgrade from 1.9,
2. Import of questions exported from 1.9, and
3. Restore of courses backed-up from 1.9.

It also applies to the calculated question type.

MDL-29058 question export: include files from hints & combined feedback.

MDL-29739 question import used a bad default for text formats.

The new logic is that the questiontext defaults to HTML if the format is
not specified, then all other fields default to the same format of the
question text.

However, good practice is that the XML file should specify the format
for each bit of text content.

This code is not 100% backwards-compatible, since some methods have new
arguments, however for question types that have not been updated, it
will just generate a PHP Warning, which is, I think, and OK way to let
qtype developers know that they need to update their question types.

MDL-29970 question preview: Fill correct only if qtype supports it

MDL-28292 - Blocks - Patch supplied by Chris Follin to fix blocks with empty titles that disappear when docked

MDL-25823 lesson mod: fixed true and false question feedback.

MDL-30044 SCORM documenting function scorm_report_list

MDL-28277 SCORM Polishing codes

MDL-28277 SCORM remove whitespace from patch

MDL-28277 MDL-30009 fix for started on/last accessed on dates for users with no attempts.

MDL-28277 small bug fixes
modified:   mod/scorm/report/interactions/report.php
modified:   mod/scorm/report/interactions/responsessettings_form.php
modified:   mod/scorm/report/reportlib.php

MDL-28277 Adding course context to format_Strings

MDL-28277 removed IN from sql statments

MDL-28277 formating codes

MDL-28277 Small fixes

MDL-28277 Added function to find question count

MDL-28277 Basic Skeleton update
modified:   mod/scorm/report/interactions/report.php

MDL-28277 First Version push of the interactions plugin
new file:   mod/scorm/report/interactions/lang/en/scormreport_interactions.php
new file:   mod/scorm/report/interactions/report.php
new file:   mod/scorm/report/interactions/responsessettings_form.php
new file:   mod/scorm/report/interactions/version.php

MDL27522 First version Push

modified:   mod/scorm/report.php
new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
modified:   mod/scorm/report.php
modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
modified:   mod/scorm/report/basic/db/install.php
modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
modified:   mod/scorm/report/basic/db/install.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/basic/version.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/db/install.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php

modified:   mod/scorm/db/install.xml
new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/db/upgrade.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/db/install.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php
modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
modified:   mod/scorm/db/upgrade.php
modified:   mod/scorm/report.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
modified:   mod/scorm/report/basic/report.php
modified:   mod/scorm/report/default.php
modified:   mod/scorm/report/reportlib.php

new file:   mod/scorm/db/subplugins.php
modified:   mod/scorm/lang/en/scorm.php
modified:   mod/scorm/report.php
new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
new file:   mod/scorm/report/basic/report.php
new file:   mod/scorm/report/basic/version.php
new file:   mod/scorm/report/default.php
new file:   mod/scorm/report/reportlib.php
modified:   mod/scorm/tabs.php
modified:   mod/scorm/userreport.php
modified:   mod/scorm/version.php

weekly release 2.2dev

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

MDL-29213 - add clarification note + todo once MDL-30039 arrives

SCORM MDL-30041 fix case of string

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

MDL-29283 import TCPDF to 5.9.133 - clean whitespace

MDL-29213 - fix for bug with flash player and IE 9

(cherry-picked and amended with 1-line whitespace)

MDL-29283 import TCPDF to 5.9.133 - fix permissions

Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle

Merge branch 'w43_MDL-29982_m22_canaccess' of git://github.com/skodak/moodle

MDL-29879 qbehaviour missing. Fix bad lang string.

Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle

MDL-30005 regression fix for non http/ftp urls

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

MDL-28720 calendar: Quick fix of a regression in set.php

Merge branch 'w43_MDL-29964_m22_fixenrolevents' of git://github.com/skodak/moodle

Merge branch 'w43_MDL-29990_m22_navcontinue' of git://github.com/skodak/moodle

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

Merge branch 'w43_MDL-29980_m22_flowcss' of git://github.com/skodak/moodle

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

MDL-27521 Updates the can_finalize and can_unfinalize methods to deal with passing a submission object that isn't one (in this case is a Boolean value). This will result in both methods now returning false. Kick on effect is that it corrects the bug described in MDL-27521 by removing the button if it isn't possible to finalize the submission.

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

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

Automatically generated installer lang files

Merge branch 'w43_MDL-29925_m22_calendar' of git://github.com/skodak/moodle

MDL-29164 question import, missing lang string.

AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END

Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle

Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle

Merge branch 'w43_MDL-29972_m22_langreset' of git://github.com/skodak/moodle

Merge branch 'w43_MDL-29966_m22_grouploading' of git://github.com/skodak/moodle

MDL-29955: filestorage/file_types: add support for .f4v, .m4v and .webm

Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle

MDL-30005 URL : fixed typos

Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle