MDL-27899 Moved initialise_fullme during setup to after sam has been initialised

on-demand release 2.1beta

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

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

MDL-27490 Implement a manage question behaviours admin page

While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.

AMOS BEGIN
 MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
 MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
 MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
 MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
 MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
 MOV [deletingqtype,admin],[deletingqtype,question]
 MOV [numquestions,admin],[numquestions,question]
 MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
 MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
 MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END

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

MDL-27868 Hints (and some other things) lost when re-editing calculated* questions.

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

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

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

MDL-27898 fix question/engine/simpletest/testdatalib.php unit tests.

Now that MDL-27897 is fixed.

MDL-27897 moodle_database::get_in_or_equal must not use a static variable.

It makes unit testing impossible. Switch to a field.

on-demand release 2.1beta

MDL-27500 editor - updated plugin version references, thirdparty version reference and tinymce upgrade readme

MDL-27500 HTML Editor - bump version

MDL-27500 HTML Editor - deleted 3.3.9.2 build

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

MDL-27887 In developer debug, use uncompressed TinyMCE code.

MDL-27869 Fix images in numerical and calculated questions.

Also fix an embarassing TODO in multianswer quetsions.

MDL-27878 make progress bars fail explicity if you forget to call create().

MDL-27877 question engine progress bars not working.

weekly release 2.1beta

fix permissions

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

MDL-26105 blocks: made the block settings help icons work

MDL-26105 blocks: readded the my moodle page's page type list generator function

Backup - mod lesson conversion: apply jumpto fix only to matching question types.

MDL-27819 Backup - fixed extra answers/jump data.
- fixed unset causing missing property
- fixed answers empty notice, allowed for page with no answers.

Merge branch 'wip-MDL-24355-master' of git://github.com/andyjdavis/moodle

MDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php

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

MDL-27797 supplimental. Fix two minor issues found by Sam H during testing.

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

MDL-27865 fix editing of calculated* questions.

MDL-27819 Backup - mod_lesson conversion: optimized page buffering from all pages to 3 pages

MDL-27819 backup - added nextpageid and prevpageid elements to lesson moodle1 backup conversion to 2.x

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

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

MDL-27820 backup - fix backup of ratings

MDL-27863 moodlelib - fixed testcase faliure in MDL-27577

MDL-24355 tag: minor clean up of tags changes

MDL-24355 Fixed up deletion of tag correlations when deleting tags

MDL-24355 Added code to delete any tag correlations that wern't just identified

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

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

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

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

Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle

SCORM MDL-27858 - fix typo

Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle

MDL-27854 qformat_xml fix import/export of essay questions to include the new options.

Automatically generated installer lang files

MDL-27797 fix all the codechecker issues in format_xml

After this change, I can still export my test course with one of each question type, and all the unit tests still pass.

MDL-27797 fix bugs with Moodle XML export.

MDL-27759 fix whitespace

MDL-27852 local_qeupgradehelper convertquiz.php script was broken.

Merge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja/moodle

Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle

MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).

Also, refactor calculatedmulti restore to avoid duplication.

MDL-27708 Fixed the version of language packs to install in 2.1

MDL-25461 Installing a language pack is recorded in moodle.org statistics

This patch fixes the URLs for fetching data from download.moodle.org so
that the requests are recorded in statistics collector download.php.
Note that we do not record fetching languages.md5 as we want to
record the real .zip downloads only.

MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data

MDL-27639 restore of attempt data from 2.0 - first attempt.

This is now at the stage where it mostly appears to work, at lease on
one backup file.

MDL-27639 add two missing language strings.

Without these strings, important information for debugging is not displayed.

MDL-27839 supply default qtype_essay_options if they are not present in the XML.

MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0.

MDL-27844 files support added to get_users_by_id()

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

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

MDL-27835_for_master fix

MDL-27825 Improved check of themedesignermode to prevent errors if it isn't set

MDL-27552 whitespace fixes

MDL-27759 Fixed conflicts for integration

MDL-27759 user webservice - added new PARAM for timezone PARAM_TIMEZONE, to validate timezone input in webservice while deling with user information

Merge branch 'MDL-27834' of git://github.com/kordan/moodle

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

Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle

Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes

MDL-27822 rename new methods

MDL-27822 old module version should be available in restore_activity_structure_step::define_structure()

Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle

MDL-27286 recent files repo - fix for oracle and cleanup

MDL-27834 fix

whitespace fixes

MDL-27552 get webservice token by providing username and password

MDL-27811 Fixed incorrect qtype_essay conversion

Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes

Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle

MDL-27497, using webservice token to upload files

MDL-27446 Backup - added answers 'jumpto' conversion to moodle1 converter for
lesson

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

Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle

Merged branch 'MDL-26960' of git://git.luns.net.uk/moodle with changes

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

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

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

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

Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle

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

Merged branch 'MDL-27781' of git://github.com/mouneyrac/moodle.git with changes