diff --git a/documentation/changelog.html b/documentation/changelog.html
index 175e069365a..493a2830ed2 100755
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
@@ -1018,6 +1018,18 @@
Stylesheets and theming
Web services
+ - [2021-08-25] (47465bf5) Webservice: download attachments from assignments
+ - [2021-08-25] (396ded29) Webservice: download forum attachment
+ - [2021-08-25] (ff516d16) Webservice: allow show message
+ - [2021-08-25] (a480dbdc) Webservice: allow show document in frame + quiz tool + survey tool
+ - [2021-08-25] (f3e76528) Webservice: set session variable is_allowed_in_course
+ - [2021-08-25] (d2b6cc76) Webservice: get student list by work
+ - [2021-08-25] (7e2d42c0) Webservice: get work users
+ - [2021-08-25] (475fde3f) Webservice: get work students without publications
+ - [2021-08-25] (5ab7fe02) Webservice: get work list (details for works)
+ - [2021-08-25] (8f79a6f7) Webservice: delete work corrections
+ - [2021-08-25] (137cea2d) Webservice: set global course info
+ - [2021-08-24] (4d67a5ca) Webservice: delete student work
- [2021-08-24] (c146d907) Webservice: set visibility to student work
- [2021-08-24] (9b8d7184) Webservice: get course assignments
- [2021-08-23] (e37ea9b7) Webservice: Fix call to api_get_course_info
diff --git a/main/common_cartridge/cc13_export.php b/main/common_cartridge/cc13_export.php
index 456c26ac00d..afe07e8bd99 100644
--- a/main/common_cartridge/cc13_export.php
+++ b/main/common_cartridge/cc13_export.php
@@ -47,7 +47,7 @@
$course = CourseSelectForm::get_posted_course(null, 0, '', $course);
$imsccFile = Cc13ExportConvert::export($course);
if ($imsccFile !== false) {
- echo Display::return_message(get_lang('ImsccCreated'), 'confirm');
+ echo Display::return_message(get_lang('IMSCCCreated'), 'confirm');
echo '
';
echo Display::toolbarButton(
get_lang('Download'),
diff --git a/main/common_cartridge/cc13_import.php b/main/common_cartridge/cc13_import.php
index 01e9a4d6178..a276f8f6b7b 100644
--- a/main/common_cartridge/cc13_import.php
+++ b/main/common_cartridge/cc13_import.php
@@ -25,7 +25,7 @@
];
$form = new FormValidator('cc_import', 'post', api_get_self().'?'.api_get_cidreq());
-$form->addFile('cc_file', get_lang('ImsccFile'));
+$form->addFile('cc_file', get_lang('IMSCCFile'));
$form->addButtonImport(get_lang('Import'));
if ($form->validate()) {
@@ -59,14 +59,14 @@
$detected = Imscc13Import::detectFormat($filepath);
if ($detected) {
Imscc13Import::execute($filepath);
- Display::addFlash(Display::return_message(get_lang('CcFileImported'), 'normal', false));
+ Display::addFlash(Display::return_message(get_lang('IMSCCFileImported'), 'normal', false));
}
}
}
}
$template = new Template(get_lang('ImportCcVersion13'));
-Display::addFlash(Display::return_message(get_lang('ImportCcInstructions'), 'normal', false));
+Display::addFlash(Display::return_message(get_lang('IMSCCImportInstructions'), 'normal', false));
$template->assign('form', $form->returnForm());
$templateName = $template->get_template('common_cartridge/import_cc.tpl');
$content = $template->fetch($templateName);
diff --git a/main/course_info/maintenance.php b/main/course_info/maintenance.php
index 4797fe9a1d8..0575e081593 100755
--- a/main/course_info/maintenance.php
+++ b/main/course_info/maintenance.php
@@ -60,7 +60,7 @@
-
+
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 9909230acdc..fa52eb24ff8 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -8792,4 +8792,21 @@
$CoursesUsage = "Courses usage";
$HideConnectionTime = "Hide connection time";
$CourseInWhichTheQuestionWasInitiallyCreated = "Course in which the question was initially created.";
+$ApprenticeshipContract = "Apprenticeship contract";
+$ExportCcVersion13 = "Export Common Cartridge v1.3";
+$ImportCcVersion13 = "Import Common Cartridge v1.3";
+$ExportCcVersion13Info = "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.";
+$ImportCcVersion13Info = "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.";
+$IMSCCCreated = "IMS CC file created.";
+$IMSCCFile = "IMS CC file";
+$IMSCCFileImported = "IMS CC file imported.";
+$IMSCCImportInstructions = "Upload any IMS CC (.imscc or .zip) file in the right version and it will be extracted directly into your course.";
+$IMSCC13 = "IMS Common Cartridge v1.3";
+$HideQuestionNumber = "Hide question number";
+$PendingAttempts = "Pending attempts";
+$EditInProfile = "Edit in profile";
+$Guidance = "Guidance";
+$RemoveTime = "Remove time";
+$CopyWithSessionContent = "Copy with session content";
+$ExportByClass = "Export by class";
?>
\ No newline at end of file
diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php
index 417525d0326..f900373d55e 100644
--- a/main/lang/french/trad4all.inc.php
+++ b/main/lang/french/trad4all.inc.php
@@ -8724,4 +8724,21 @@
$CoursesUsage = "Utilisation des cours";
$HideConnectionTime = "Masquer les temps de connection";
$CourseInWhichTheQuestionWasInitiallyCreated = "Cours dans lequel la question a été créée initialement.";
+$ApprenticeshipContract = "Contrat d'apprentissage";
+$ExportCcVersion13 = "Exporter à Common Cartridge v1.3";
+$ImportCcVersion13 = "Importer depuis Common Cartridge v1.3";
+$ExportCcVersion13Info = "Exporter le contenu de votre course au format IMS Common Cartridge v1.3, pour le partager avec d'autres plateformes qui supportent ce format.";
+$ImportCcVersion13Info = "Importer un cours au format IMS Common Cartridge v1.3, depuis une autre plateforme qui supporte ce format. La version est importante.";
+$IMSCCCreated = "Fichier IMS CC créé.";
+$IMSCCFile = "Fichier IMS CC";
+$IMSCCFileImported = "Fichier IMS CC importé.";
+$IMSCCImportInstructions = "Envoyer un fichier au format IMS CC (.imscc) dans la version correcte, et il sera extrait directement au sein de votre cours.";
+$IMSCC13 = "IMS Common Cartridge v1.3";
+$HideQuestionNumber = "Cacher le numéro des questions";
+$PendingAttempts = "Tentatives en attente";
+$EditInProfile = "Éditer dans le profil";
+$Guidance = "Guidance";
+$RemoveTime = "Supprimer du temps";
+$CopyWithSessionContent = "Copier avec le contenu de session";
+$ExportByClass = "Exporter par classe";
?>
\ No newline at end of file
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index 656227a1dc3..09efd3f01db 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -8820,4 +8820,21 @@
$CoursesUsage = "Uso de cursos";
$HideConnectionTime = "Ocultar tiempo de conexión";
$CourseInWhichTheQuestionWasInitiallyCreated = "Curso en el cual la pregunta fue creada.";
+$ApprenticeshipContract = "Contrato de aprendizaje";
+$ExportCcVersion13 = "Exportar en Common Cartridge v1.3";
+$ImportCcVersion13 = "Importar desde Common Cartridge v1.3";
+$ExportCcVersion13Info = "Exporte el contenido de su curso en el formato IMS Common Cartridge 1.3, para compartirlo con otras plataformas.";
+$ImportCcVersion13Info = "Importe un curso en el formato IMS Common Cartridge 1.3, desde otra plataforma compatible con este formato. La versión es relevante.";
+$IMSCCCreated = "Archivo IMS CC creado.";
+$IMSCCFile = "Archivo IMS CC";
+$IMSCCFileImported = "Archivo IMS CC importado.";
+$IMSCCImportInstructions = "Suba un archivo IMS CC (.imscc) en la versión correcta y será extraido directamente en su curso.";
+$IMSCC13 = "IMS Common Cartridge v1.3";
+$HideQuestionNumber = "Esconder el número de la pregunta";
+$PendingAttempts = "Intentos en espera";
+$EditInProfile = "Editar en el perfil";
+$Guidance = "Guia";
+$RemoveTime = "Eliminar tiempo";
+$CopyWithSessionContent = "Copiar con contenido de sesión";
+$ExportByClass = "Exportar por clase";
?>
\ No newline at end of file
diff --git a/plugin/onlyoffice/README.md b/plugin/onlyoffice/README.md
index 0a6c9734b11..dd702fc298d 100644
--- a/plugin/onlyoffice/README.md
+++ b/plugin/onlyoffice/README.md
@@ -138,3 +138,8 @@ The table below will help you to make the right choice.
\** Support for all conditions and gradient. Adding/Editing capabilities are coming soon
+## Note on SSL
+
+As for all SSL to non-SSL communication, this plugin will not work fully if your
+Chamilo portal works in HTTP and your OnlyOffice Document server works in HTTPS, or vice-versa.
+You will need to ensure the same protocol on both sides.
\ No newline at end of file
- +
- +