moodle.git
9 years agoMDL-27703 gradebook: altered an sql query in the user report. join with no on clause...
andrew [Thu, 10 Nov 2011 03:42:21 +0000 (11:42 +0800)]
MDL-27703 gradebook: altered an sql query in the user report. join with no on clause causes an error in some DBs

9 years agoMoodle release 2.2beta v2.2.0-beta
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 10:04:15 +0000 (11:04 +0100)]
Moodle release 2.2beta

9 years agoFix permissions
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:58:09 +0000 (10:58 +0100)]
Fix permissions

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Tue, 15 Nov 2011 09:54:40 +0000 (10:54 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 15 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files

9 years agoMDL-29956 ims-cc - whitespace cleanup
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 22:35:12 +0000 (23:35 +0100)]
MDL-29956 ims-cc - whitespace cleanup

9 years agoMDL-29956 ims-cc - disabling export and cleaning some unused code
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 20:16:24 +0000 (21:16 +0100)]
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;

9 years agoUpdated text conversion to read and store safe xml strings.
Darko Miletic [Sun, 6 Nov 2011 17:39:00 +0000 (14:39 -0300)]
Updated text conversion to read and store safe xml strings.

9 years agoMDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210...
Mark Nielsen [Wed, 26 Oct 2011 17:38:36 +0000 (10:38 -0700)]
MDL-29956: Common Cartridge should handle HTML content more natively (r17188, r17210:17265)

Also implemented support for LTI icon during import.

9 years agoMDL-29956: Implement export of Quiz activity (r16977, r17032)
Mark Nielsen [Wed, 26 Oct 2011 17:33:49 +0000 (10:33 -0700)]
MDL-29956: Implement export of Quiz activity (r16977, r17032)

9 years agoMDL-29956: Implement common cartridge export (r16882)
Mark Nielsen [Wed, 26 Oct 2011 17:14:54 +0000 (10:14 -0700)]
MDL-29956: Implement common cartridge export (r16882)

9 years agoMDL-29793 Advanced grading - do not execute the restore step if the grading.xml is...
David Mudrak [Mon, 14 Nov 2011 20:09:52 +0000 (21:09 +0100)]
MDL-29793 Advanced grading - do not execute the restore step if the grading.xml is missing

9 years agoMDL-29793 Advanced grading backup - fixed the recently renamed DB field
David Mudrak [Mon, 14 Nov 2011 20:08:06 +0000 (21:08 +0100)]
MDL-29793 Advanced grading backup - fixed the recently renamed DB field

9 years agoMDL-27622 theme_mymobile: add it to core themes
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:45:48 +0000 (12:45 +0100)]
MDL-27622 theme_mymobile: add it to core themes

9 years agoMerge branch 'lti' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:37:43 +0000 (12:37 +0100)]
Merge branch 'lti' of git://github.com/scriby/moodle

9 years agoMDL-20534 lti: bump version and requires to current before integration, yay!
Eloy Lafuente (stronk7) [Mon, 14 Nov 2011 11:35:52 +0000 (12:35 +0100)]
MDL-20534 lti: bump version and requires to current before integration, yay!

9 years agoMerged MDL-29108 Advanced grading
Sam Hemelryk [Mon, 14 Nov 2011 09:01:05 +0000 (22:01 +1300)]
Merged MDL-29108 Advanced grading

9 years agoMerge pull request #25 from marinaglancy/wip-nov14-rubric
David Mudrak [Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)]
Merge pull request #25 from marinaglancy/wip-nov14-rubric

9 years agoMDL-27036 AICC HACP handling - add missing check for correct user with has_capability.
Dan Marsden [Mon, 14 Nov 2011 08:03:47 +0000 (21:03 +1300)]
MDL-27036 AICC HACP handling - add missing check for correct user with has_capability.

9 years agoMDL-29108: added comments, declared functions visibility, renamed variables; also...
Marina Glancy [Mon, 14 Nov 2011 06:53:14 +0000 (14:53 +0800)]
MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240

9 years agoMDL-30241: fixing Javascript to work in IE as well
Marina Glancy [Mon, 14 Nov 2011 06:48:28 +0000 (14:48 +0800)]
MDL-30241: fixing Javascript to work in IE as well

9 years agoMerge branch 'MDL-28670' of git://github.com/nebgor/moodle
Sam Hemelryk [Mon, 14 Nov 2011 04:49:47 +0000 (17:49 +1300)]
Merge branch 'MDL-28670' of git://github.com/nebgor/moodle

9 years agoMDL-28670 webservice : (review) changes improving performance
Aparup Banerjee [Mon, 14 Nov 2011 03:25:36 +0000 (11:25 +0800)]
MDL-28670 webservice : (review) changes improving performance

9 years agoMerge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 13 Nov 2011 23:10:17 +0000 (12:10 +1300)]
Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-30026' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:35:13 +0000 (19:35 +0100)]
Merge branch 'MDL-30026' of git://github.com/stronk7/moodle

9 years agoMDL-30026 improve session lock - stronger detection for oracle
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:23:53 +0000 (19:23 +0100)]
MDL-30026 improve session lock - stronger detection for oracle

9 years agoMDL-30026 improve session lock - mssql workaround for bug with scalar returned values
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:06:44 +0000 (19:06 +0100)]
MDL-30026 improve session lock - mssql workaround for bug with scalar returned values

9 years agoMDL-30026 improve session lock - unit tests & minor comment fixup
Eloy Lafuente (stronk7) [Sun, 13 Nov 2011 18:05:57 +0000 (19:05 +0100)]
MDL-30026 improve session lock - unit tests & minor comment fixup

9 years agoAutomatically generated installer lang files
AMOS bot [Sun, 13 Nov 2011 14:14:31 +0000 (15:14 +0100)]
Automatically generated installer lang files

9 years agoMDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid
David Mudrak [Sun, 13 Nov 2011 13:07:33 +0000 (14:07 +0100)]
MDL-29108 Advanced grading - renaming DB field forminstanceid to instanceid

As a response to Sam's review (7.4)

9 years agoMDL-29108 Advanced grading - renaming DB fields formid to definitionid
David Mudrak [Sun, 13 Nov 2011 13:01:57 +0000 (14:01 +0100)]
MDL-29108 Advanced grading - renaming DB fields formid to definitionid

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

9 years agoMDL-29108 Remove all associated grading areas when the context is being deleted
David Mudrak [Sun, 13 Nov 2011 12:50:00 +0000 (13:50 +0100)]
MDL-29108 Remove all associated grading areas when the context is being deleted

9 years agoAutomatically generated installer lang files
AMOS bot [Sun, 13 Nov 2011 00:55:17 +0000 (00:55 +0000)]
Automatically generated installer lang files

9 years agoMDL-27622 theme_mymobile: whitespace fixes
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 19:22:41 +0000 (20:22 +0100)]
MDL-27622 theme_mymobile: whitespace fixes

9 years agoMDL-20534 lti: A8. Removing locallib.php require from lib.php
Chris Scribner [Fri, 11 Nov 2011 18:54:54 +0000 (13:54 -0500)]
MDL-20534 lti: A8. Removing locallib.php require from lib.php

9 years agoMDL-20534 lti: Updating call to lti_add_instance with 2nd argument.
Chris Scribner [Fri, 11 Nov 2011 18:47:53 +0000 (13:47 -0500)]
MDL-20534 lti: Updating call to lti_add_instance with 2nd argument.

9 years agoMDL-20534 lti: Fixing some language in lti's index.php
Chris Scribner [Fri, 11 Nov 2011 18:40:59 +0000 (13:40 -0500)]
MDL-20534 lti: Fixing some language in lti's index.php

9 years agoMDL-20534 lti: Getting rid of references to "Basic" LTI in language file
Chris Scribner [Fri, 11 Nov 2011 18:34:24 +0000 (13:34 -0500)]
MDL-20534 lti: Getting rid of references to "Basic" LTI in language file

9 years agoMDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.
Chris Scribner [Fri, 11 Nov 2011 18:31:09 +0000 (13:31 -0500)]
MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing.

9 years agoMerge branch 'MDL-30057' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 14:47:33 +0000 (15:47 +0100)]
Merge branch 'MDL-30057' of git://github.com/stronk7/moodle

9 years agoAdded Moodle 1.9 -> Moodle 2 converter
Darko Miletic [Tue, 13 Sep 2011 16:02:17 +0000 (13:02 -0300)]
Added Moodle 1.9 -> Moodle 2 converter

9 years agoMDL-29108 Orphaned areas are excluded from search results
David Mudrak [Fri, 11 Nov 2011 13:16:17 +0000 (14:16 +0100)]
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).

9 years agoMDL-29483 The capability to manage grading forms can be overridden at the Assignment...
David Mudrak [Fri, 11 Nov 2011 12:59:04 +0000 (13:59 +0100)]
MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level

9 years agoMDL-29108 Do not display grading method selector for non-privileged users
David Mudrak [Fri, 11 Nov 2011 12:58:45 +0000 (13:58 +0100)]
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.

9 years agoMerge branch 'MDL-29945' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 11:54:11 +0000 (12:54 +0100)]
Merge branch 'MDL-29945' of git://github.com/timhunt/moodle

9 years agoMDL-29945 incorrect logic when testing if a qtype can be uninstalled.
Tim Hunt [Fri, 11 Nov 2011 11:40:07 +0000 (11:40 +0000)]
MDL-29945 incorrect logic when testing if a qtype can be uninstalled.

Thanks to Andrew Davis for catching this during testing.

9 years agoMDL-29108 Improving get_grading_method() documentation
David Mudrak [Fri, 11 Nov 2011 11:18:02 +0000 (12:18 +0100)]
MDL-29108 Improving get_grading_method() documentation

As a response to Sam's review (10)

9 years agoMDL-29108 Fixing a typo
David Mudrak [Fri, 11 Nov 2011 11:17:01 +0000 (12:17 +0100)]
MDL-29108 Fixing a typo

Spotted by Sam during the review (23)

9 years agoMDL-29108 Removing global variables where they are not needed
David Mudrak [Fri, 11 Nov 2011 11:10:02 +0000 (12:10 +0100)]
MDL-29108 Removing global variables where they are not needed

Spotted by Sam during the review (17.1 and 17.3)

9 years agoMDL-27622 theme_mymobile: quick regression fix of var
Sam Hemelryk [Fri, 11 Nov 2011 05:36:10 +0000 (18:36 +1300)]
MDL-27622 theme_mymobile: quick regression fix of  var

9 years agoMerge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Fri, 11 Nov 2011 05:35:13 +0000 (18:35 +1300)]
Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle

9 years agoMDL-27037 wiki : fixed whitespace.
Aparup Banerjee [Fri, 11 Nov 2011 05:27:27 +0000 (13:27 +0800)]
MDL-27037 wiki : fixed whitespace.

9 years agoMDL-27037, wiki does not support visiblegroups functionality
Mayank Gupta [Fri, 8 Apr 2011 18:10:36 +0000 (23:40 +0530)]
MDL-27037, wiki does not support visiblegroups functionality

9 years agoMerge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Fri, 11 Nov 2011 03:26:22 +0000 (11:26 +0800)]
Merge branch 'wip-MDL-26712-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 02:37:55 +0000 (03:37 +0100)]
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

9 years agoMerge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 01:42:40 +0000 (02:42 +0100)]
Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-22351' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Fri, 11 Nov 2011 01:31:21 +0000 (02:31 +0100)]
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)

9 years agoMDL-29529 Assignment: Fix regression caused by MDL-27638
Stephen Bourget [Thu, 10 Nov 2011 22:08:43 +0000 (17:08 -0500)]
MDL-29529 Assignment: Fix regression caused by MDL-27638

9 years agoMerge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 23:20:13 +0000 (00:20 +0100)]
Merge branch 'wip-MDL-25511' of git://github.com/lazydaisy/moodle

Conflicts:
theme/canvas/style/course.css

9 years agoMerge branch 'MDL-29808' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 20:54:36 +0000 (21:54 +0100)]
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 :-)

9 years agoMerge branch 'MDL-29945' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)]
Merge branch 'MDL-29945' of git://github.com/timhunt/moodle

9 years agoMDL-29808 qtypes: use standard pluginname strings and update version.php
Tim Hunt [Thu, 3 Nov 2011 16:44:26 +0000 (16:44 +0000)]
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

9 years agoMDL-29808 qformats: use standard pluginname string and add version.php
Tim Hunt [Thu, 3 Nov 2011 11:16:14 +0000 (11:16 +0000)]
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

9 years agoMDL-29808 qbehaviours: update to use ->dependencies in version.php
Tim Hunt [Wed, 2 Nov 2011 17:13:11 +0000 (17:13 +0000)]
MDL-29808 qbehaviours: update to use ->dependencies in version.php

9 years agoMDL-29945 plugin management: don't show Uninstall links for required plugins.
Tim Hunt [Wed, 2 Nov 2011 15:57:25 +0000 (15:57 +0000)]
MDL-29945 plugin management: don't show Uninstall links for required plugins.

9 years agoMDL-28277 scorm report - set interaction as standard + version component
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 15:55:54 +0000 (16:55 +0100)]
MDL-28277 scorm report - set interaction as standard + version component

9 years agoMerge branch 'MDL-30027' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 00:58:57 +0000 (01:58 +0100)]
Merge branch 'MDL-30027' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-30043' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 00:49:56 +0000 (01:49 +0100)]
Merge branch 'MDL-30043' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-29931' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 00:43:07 +0000 (01:43 +0100)]
Merge branch 'MDL-29931' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-28426' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 10 Nov 2011 00:32:01 +0000 (01:32 +0100)]
Merge branch 'MDL-28426' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30145' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 23:25:45 +0000 (00:25 +0100)]
Merge branch 'MDL-30145' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30158-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 23:22:13 +0000 (00:22 +0100)]
Merge branch 'MDL-30158-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 22:59:02 +0000 (23:59 +0100)]
Merge branch 'w44_MDL-30148_m22_guestpass' of git://github.com/skodak/moodle

9 years agoMerge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 22:47:01 +0000 (23:47 +0100)]
Merge branch 'w44_MDL-30131_m22_enrolcaching' of https://github.com/skodak/moodle

9 years agoMerged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with...
Sam Hemelryk [Wed, 9 Nov 2011 21:15:50 +0000 (10:15 +1300)]
Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution

9 years agoMDL-29798 Final clean-up before submitting for the integration review
David Mudrak [Wed, 9 Nov 2011 21:08:09 +0000 (22:08 +0100)]
MDL-29798 Final clean-up before submitting for the integration review

9 years agoMerge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak...
Sam Hemelryk [Wed, 9 Nov 2011 20:41:38 +0000 (09:41 +1300)]
Merge branch 'w44_MDL-30150_m22_pagetypefrankenstyle' of git://github.com/skodak/moodle

9 years agoMerge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 15:35:57 +0000 (16:35 +0100)]
Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle

9 years agoNOBUG: Whitespace fixes
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 15:32:30 +0000 (16:32 +0100)]
NOBUG: Whitespace fixes

9 years agoMerge branch 'MDL-27542b' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 14:55:07 +0000 (15:55 +0100)]
Merge branch 'MDL-27542b' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Wed, 9 Nov 2011 09:55:04 +0000 (17:55 +0800)]
Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak...
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 09:05:40 +0000 (10:05 +0100)]
Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle

9 years agoMDL-29656 Fix bad string reference
Sun Zhigang [Tue, 4 Oct 2011 11:50:30 +0000 (19:50 +0800)]
MDL-29656 Fix bad string reference

9 years agoMerge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 08:43:18 +0000 (09:43 +0100)]
Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-28277 Changing optional_param to optional_param_array
Ankit Kumar Agarwal [Wed, 9 Nov 2011 07:59:26 +0000 (13:29 +0530)]
MDL-28277 Changing optional_param to optional_param_array

9 years agoMDL-29696 mod/data - fixed page continuing after footer.
Dan Poltawski [Tue, 1 Nov 2011 14:59:08 +0000 (14:59 +0000)]
MDL-29696 mod/data - fixed page continuing after footer.

9 years agoMDL-29722 - No default guest enrol instance for requested courses
Sun Zhigang [Tue, 11 Oct 2011 01:21:23 +0000 (09:21 +0800)]
MDL-29722 - No default guest enrol instance for requested courses

9 years agoMerge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Wed, 9 Nov 2011 05:40:24 +0000 (13:40 +0800)]
Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle

9 years agoMDL-27622 theme_mymobile: Pre-integration clean up
Sam Hemelryk [Wed, 9 Nov 2011 05:18:41 +0000 (18:18 +1300)]
MDL-27622 theme_mymobile: Pre-integration clean up

9 years agoMerge branch 'MDL-30021' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 9 Nov 2011 04:19:20 +0000 (12:19 +0800)]
Merge branch 'MDL-30021' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29058' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 9 Nov 2011 03:29:45 +0000 (11:29 +0800)]
Merge branch 'MDL-29058' of git://github.com/timhunt/moodle

9 years agoMDL-29812 partcipiant report - breaks when filtering by user
Dan Poltawski [Tue, 1 Nov 2011 17:02:23 +0000 (17:02 +0000)]
MDL-29812 partcipiant report - breaks when filtering by user

9 years agoMerge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Wed, 9 Nov 2011 03:05:32 +0000 (11:05 +0800)]
Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle

9 years agoMDL-25511-theme_canvas tidy up CORE css files
Mary Evans [Wed, 9 Nov 2011 02:22:36 +0000 (02:22 +0000)]
MDL-25511-theme_canvas tidy up CORE css files

9 years agoMerge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:20:26 +0000 (02:20 +0100)]
Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:13:38 +0000 (02:13 +0100)]
Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 01:03:25 +0000 (02:03 +0100)]
Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:34:08 +0000 (01:34 +0100)]
Merge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle

9 years agoMDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:30:51 +0000 (01:30 +0100)]
MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes

9 years agoMerge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 9 Nov 2011 00:20:06 +0000 (01:20 +0100)]
Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle