Skip to content
Snippets Groups Projects
Commit 9c4d69c8 authored by Frode Petterson's avatar Frode Petterson
Browse files

Merge branch 'rc3'

parents e169b639 c501ab11
No related branches found
No related tags found
No related merge requests found
Subproject commit 751af89ca8c492044437b0b089fe228e061a1bd6
Subproject commit 23f20f7bafd8e8c9ddafe5a6768c42f01975b0e7
......@@ -83,6 +83,8 @@ $string['enablesavecontentstate'] = 'Save content state';
$string['enablesavecontentstate_help'] = 'Automatically save the current state of interactive content for each user. This means that the user may pick up where he left off.';
$string['contentstatefrequency'] = 'Save content state frequency';
$string['contentstatefrequency_help'] = 'In seconds, how often do you wish the user to auto save their progress. Increase this number if you\'re having issues with many ajax requests';
$string['enabledlrscontenttypes'] = 'Enable LRS dependent content types';
$string['enabledlrscontenttypes_help'] = 'Makes it possible to use content types that rely upon a Learning Record Store to function properly, like the Questionnaire content type.';
// Admin menu.
$string['settings'] = 'H5P Settings';
......
Subproject commit fd34af6964857e8a2f9f49423d6bf1a109576ac6
Subproject commit 6b6d4cd109a0d187f6523fa1428a9a0440917c05
......@@ -56,6 +56,12 @@ if ($ADMIN->fulltree) {
get_string('contentstatefrequency', 'hvp'),
get_string('contentstatefrequency_help', 'hvp'), 30, PARAM_INT));
// Content state.
$settings->add(
new admin_setting_configcheckbox('mod_hvp/enable_lrs_content_types',
get_string('enabledlrscontenttypes', 'hvp'),
get_string('enabledlrscontenttypes_help', 'hvp'), 0));
// Display options for H5P frame.
$settings->add(new admin_setting_heading('mod_hvp/display_options', get_string('displayoptions', 'hvp'), ''));
$settings->add(new admin_setting_configcheckbox('mod_hvp/frame', get_string('enableframe', 'hvp'), '', 1));
......
......@@ -23,9 +23,9 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2016080903;
$plugin->version = 2016092100;
$plugin->requires = 2013051403;
$plugin->cron = 0;
$plugin->component = 'mod_hvp';
$plugin->maturity = MATURITY_RC;
$plugin->release = '1.0-rc.2';
$plugin->release = '1.0-rc.3';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment