Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into …

…1.11.x
chamilo · Aug 25, 2021 · 4d7f6fc · 4d7f6fc
2 parents ee6c847 + 0ce4c16
commit 4d7f6fc
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 7 deletions.
diff --git a/documentation/changelog.html b/documentation/changelog.html
@@ -1018,6 +1018,18 @@ <h3>Stylesheets and theming</h3>
         </ul>
         <h3>Web services</h3>
         <ul aria-live="off">
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/47465bf5d5eb1f9dd5944cf57b47ed2da2e41243">47465bf5</a>) Webservice: download attachments from assignments</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/396ded295cdb0f3b07b89956f3af296ab9a1a735">396ded29</a>) Webservice: download forum attachment</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/ff516d16cecbae461e0ae97d7363c53713ddb709">ff516d16</a>) Webservice: allow show message</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/a480dbdca1a14484640568e5b37880e5d985e880">a480dbdc</a>) Webservice: allow show document in frame + quiz tool + survey tool</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/f3e7652841e3aec8616c719f50f9236691a8268c">f3e76528</a>) Webservice: set session variable is_allowed_in_course</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/d2b6cc76d2c317ba9cc88d4821e4ce072338f5df">d2b6cc76</a>) Webservice: get student list by work</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/7e2d42c0e7e09fa525e8cb9da0282ea90fbffe0b">7e2d42c0</a>) Webservice: get work users</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/475fde3f8cd668d23a5be35385a3abba8bf30613">475fde3f</a>) Webservice: get work students without publications</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/5ab7fe025bff1b501ead8269496fdab7d19aa121">5ab7fe02</a>) Webservice: get work list (details for works)</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/8f79a6f763fc186331944c3edbfeb18cd87cba37">8f79a6f7</a>) Webservice: delete work corrections</li>
+            <li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/137cea2dcd34eb8f2e1fee98a92ae22525a0077f">137cea2d</a>) Webservice: set global course info</li>
+            <li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/4d67a5ca7fd4fc4543e9c37f5a741bbfe705c92b">4d67a5ca</a>) Webservice: delete student work</li>
             <li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/c146d907f8dfe8d4512852c07dbbe55700628b53">c146d907</a>) Webservice: set visibility to student work</li>
             <li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/9b8d71847fff0d8f56a8f1a9837be9872219d6de">9b8d7184</a>) Webservice: get course assignments</li>
             <li>[2021-08-23] (<a href="https://github.com/chamilo/chamilo-lms/commit/e37ea9b79f62c04ea4de4b6b64011e2d778ba156">e37ea9b7</a>) Webservice: Fix call to api_get_course_info</li>

diff --git 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 '<br />';
             echo Display::toolbarButton(
                 get_lang('Download'),

diff --git 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
@@ -60,7 +60,7 @@
 
 <br>
 <div class="sectiontitle">
-    <?php Display::display_icon('copy.gif', get_lang('CommonCartridge13')); ?>&nbsp;&nbsp;
+    <?php Display::display_icon('copy.gif', get_lang('IMSCC13')); ?>&nbsp;&nbsp;
     <?php echo get_lang('CommonCartridge13'); ?>
 </div>
 <div class="sectioncomment">
@@ -69,13 +69,13 @@
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>common_cartridge/cc13_export.php?<?php echo api_get_cidreq(); ?>">
             <?php echo get_lang('ExportCcVersion13'); ?></a>
             </a><br/>
-            <?php echo get_lang('ExportInfo'); ?>
+            <?php echo get_lang('ExportCcVersion13Info'); ?>
         </li>
         <li>
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>common_cartridge/cc13_import.php?<?php echo api_get_cidreq(); ?>">
             <?php echo get_lang('ImportCcVersion13'); ?></a>
             </a><br/>
-            <?php echo get_lang('ImportInfo'); ?>
+            <?php echo get_lang('ImportCcVersion13Info'); ?>
         </li>
     </ul>
 </div>

diff --git 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";
 ?>
diff --git 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";
 ?>
diff --git 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";
 ?>
diff --git 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.