Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle

Conflicts:
	mod/scorm/version.php
This commit is contained in:
Andrew Nicols 2015-05-07 10:24:11 +08:00
commit 7ae030d54e
2 changed files with 3 additions and 3 deletions

View File

@ -51,7 +51,7 @@ $capabilities = array(
'mod/scorm:skipview' => array(
'captype' => 'write',
'captype' => 'read',
'contextlevel' => CONTEXT_MODULE,
'archetypes' => array(
'student' => CAP_ALLOW
@ -83,7 +83,7 @@ $capabilities = array(
),
'mod/scorm:deleteresponses' => array(
'captype' => 'read',
'captype' => 'write',
'contextlevel' => CONTEXT_MODULE,
'archetypes' => array(
'teacher' => CAP_ALLOW,

View File

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2015051100; // The current module version (Date: YYYYMMDDXX).
$plugin->version = 2015051101; // The current module version (Date: YYYYMMDDXX).
$plugin->requires = 2015050500; // Requires this Moodle version.
$plugin->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics).
$plugin->cron = 300;