MDL-47494 ddwtos: Merge branch 'MOODLE_21_STABLE'

Conflicts:
	lang/en/qtype_ddwtos.php
	version.php
This commit is contained in:
Tim Hunt
2012-02-10 15:14:51 +00:00
3 changed files with 16 additions and 14 deletions
+5 -7
View File
@@ -4,11 +4,10 @@ This question type requires that gapselect question type
https://github.com/moodleou/moodle-qtype_gapselect/
to be installed in order to work.
This question type was originally the work of Mahmoud Kassaei at
the Open University (http://www.open.ac.uk/).
It was updated to work with the Moodle 2.1 question engine by Tim Hunt.
It was then refactored extenstively by Jamie Pratt (http://jamiep.org/)
as part of creating the gapselect question type.
This question type was originally the work of Mahmoud Kassaei at the Open
University (http://www.open.ac.uk/). It was updated to work with the Moodle 2.1
question engine by Tim Hunt. It was then refactored extenstively by Jamie Pratt
(http://jamiep.org/) as part of creating the gapselect question type.
This question type is compatible with Moodle 2.1+.
@@ -19,5 +18,4 @@ Then add question/type/ddwtos to your git ignore.
Alternatively, download the zip from
https://github.com/moodleou/moodle-qtype_ddwtos/zipball/master
unzip it into the question/type folder, and then rename the new folder to
ddwtos.
unzip it into the question/type folder, and then rename the new folder to ddwtos.
@@ -16,8 +16,7 @@
/**
*
* @package qtype
* @subpackage ddwtos
* @package qtype_ddwtos
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+10 -5
View File
@@ -17,16 +17,21 @@
/**
* Version information for the drag-and-drop words into sentences question type.
*
* @package qtype
* @subpackage ddwtos
* @package qtype_ddwtos
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2011051200;
$plugin->requires = 2011051212;
$plugin->version = 2011051200;
$plugin->requires = 2011120500;
$plugin->cron = 0;
$plugin->component = 'qtype_ddwtos';
$plugin->maturity = MATURITY_STABLE;
$plugin->release = '1.0';
$plugin->dependencies = array(
'qtype_gapselect' => 2011020100,
);
);