Skip to content

Commit 4d7f6fc

Browse files
ywarnierywarnier
committed
Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x
2 parents ee6c847 + 0ce4c16 commit 4d7f6fc

File tree

8 files changed

+75
-7
lines changed

8 files changed

+75
-7
lines changed

‎documentation/changelog.html

+12
Original file line numberDiff line numberDiff line change
@@ -1018,6 +1018,18 @@ <h3>Stylesheets and theming</h3>
10181018
</ul>
10191019
<h3>Web services</h3>
10201020
<ul aria-live="off">
1021+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/47465bf5d5eb1f9dd5944cf57b47ed2da2e41243">47465bf5</a>) Webservice: download attachments from assignments</li>
1022+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/396ded295cdb0f3b07b89956f3af296ab9a1a735">396ded29</a>) Webservice: download forum attachment</li>
1023+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/ff516d16cecbae461e0ae97d7363c53713ddb709">ff516d16</a>) Webservice: allow show message</li>
1024+
<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>
1025+
<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>
1026+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/d2b6cc76d2c317ba9cc88d4821e4ce072338f5df">d2b6cc76</a>) Webservice: get student list by work</li>
1027+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/7e2d42c0e7e09fa525e8cb9da0282ea90fbffe0b">7e2d42c0</a>) Webservice: get work users</li>
1028+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/475fde3f8cd668d23a5be35385a3abba8bf30613">475fde3f</a>) Webservice: get work students without publications</li>
1029+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/5ab7fe025bff1b501ead8269496fdab7d19aa121">5ab7fe02</a>) Webservice: get work list (details for works)</li>
1030+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/8f79a6f763fc186331944c3edbfeb18cd87cba37">8f79a6f7</a>) Webservice: delete work corrections</li>
1031+
<li>[2021-08-25] (<a href="https://github.com/chamilo/chamilo-lms/commit/137cea2dcd34eb8f2e1fee98a92ae22525a0077f">137cea2d</a>) Webservice: set global course info</li>
1032+
<li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/4d67a5ca7fd4fc4543e9c37f5a741bbfe705c92b">4d67a5ca</a>) Webservice: delete student work</li>
10211033
<li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/c146d907f8dfe8d4512852c07dbbe55700628b53">c146d907</a>) Webservice: set visibility to student work</li>
10221034
<li>[2021-08-24] (<a href="https://github.com/chamilo/chamilo-lms/commit/9b8d71847fff0d8f56a8f1a9837be9872219d6de">9b8d7184</a>) Webservice: get course assignments</li>
10231035
<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>

‎main/common_cartridge/cc13_export.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
$course = CourseSelectForm::get_posted_course(null, 0, '', $course);
4848
$imsccFile = Cc13ExportConvert::export($course);
4949
if ($imsccFile !== false) {
50-
echo Display::return_message(get_lang('ImsccCreated'), 'confirm');
50+
echo Display::return_message(get_lang('IMSCCCreated'), 'confirm');
5151
echo '<br />';
5252
echo Display::toolbarButton(
5353
get_lang('Download'),

‎main/common_cartridge/cc13_import.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
];
2626

2727
$form = new FormValidator('cc_import', 'post', api_get_self().'?'.api_get_cidreq());
28-
$form->addFile('cc_file', get_lang('ImsccFile'));
28+
$form->addFile('cc_file', get_lang('IMSCCFile'));
2929
$form->addButtonImport(get_lang('Import'));
3030

3131
if ($form->validate()) {
@@ -59,14 +59,14 @@
5959
$detected = Imscc13Import::detectFormat($filepath);
6060
if ($detected) {
6161
Imscc13Import::execute($filepath);
62-
Display::addFlash(Display::return_message(get_lang('CcFileImported'), 'normal', false));
62+
Display::addFlash(Display::return_message(get_lang('IMSCCFileImported'), 'normal', false));
6363
}
6464
}
6565
}
6666
}
6767

6868
$template = new Template(get_lang('ImportCcVersion13'));
69-
Display::addFlash(Display::return_message(get_lang('ImportCcInstructions'), 'normal', false));
69+
Display::addFlash(Display::return_message(get_lang('IMSCCImportInstructions'), 'normal', false));
7070
$template->assign('form', $form->returnForm());
7171
$templateName = $template->get_template('common_cartridge/import_cc.tpl');
7272
$content = $template->fetch($templateName);

‎main/course_info/maintenance.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
<br>
6262
<div class="sectiontitle">
63-
<?php Display::display_icon('copy.gif', get_lang('CommonCartridge13')); ?>&nbsp;&nbsp;
63+
<?php Display::display_icon('copy.gif', get_lang('IMSCC13')); ?>&nbsp;&nbsp;
6464
<?php echo get_lang('CommonCartridge13'); ?>
6565
</div>
6666
<div class="sectioncomment">
@@ -69,13 +69,13 @@
6969
<a href="<?php echo api_get_path(WEB_CODE_PATH); ?>common_cartridge/cc13_export.php?<?php echo api_get_cidreq(); ?>">
7070
<?php echo get_lang('ExportCcVersion13'); ?></a>
7171
</a><br/>
72-
<?php echo get_lang('ExportInfo'); ?>
72+
<?php echo get_lang('ExportCcVersion13Info'); ?>
7373
</li>
7474
<li>
7575
<a href="<?php echo api_get_path(WEB_CODE_PATH); ?>common_cartridge/cc13_import.php?<?php echo api_get_cidreq(); ?>">
7676
<?php echo get_lang('ImportCcVersion13'); ?></a>
7777
</a><br/>
78-
<?php echo get_lang('ImportInfo'); ?>
78+
<?php echo get_lang('ImportCcVersion13Info'); ?>
7979
</li>
8080
</ul>
8181
</div>

‎main/lang/english/trad4all.inc.php

+17
Original file line numberDiff line numberDiff line change
@@ -8792,4 +8792,21 @@
87928792
$CoursesUsage = "Courses usage";
87938793
$HideConnectionTime = "Hide connection time";
87948794
$CourseInWhichTheQuestionWasInitiallyCreated = "Course in which the question was initially created.";
8795+
$ApprenticeshipContract = "Apprenticeship contract";
8796+
$ExportCcVersion13 = "Export Common Cartridge v1.3";
8797+
$ImportCcVersion13 = "Import Common Cartridge v1.3";
8798+
$ExportCcVersion13Info = "Export your course content in the IMS Common Cartridge 1.3 format, to share it on other platforms.";
8799+
$ImportCcVersion13Info = "Import a course in IMS Common Cartridge 1.3 format, from another platform compatible with this format. The version is important.";
8800+
$IMSCCCreated = "IMS CC file created.";
8801+
$IMSCCFile = "IMS CC file";
8802+
$IMSCCFileImported = "IMS CC file imported.";
8803+
$IMSCCImportInstructions = "Upload any IMS CC (.imscc or .zip) file in the right version and it will be extracted directly into your course.";
8804+
$IMSCC13 = "IMS Common Cartridge v1.3";
8805+
$HideQuestionNumber = "Hide question number";
8806+
$PendingAttempts = "Pending attempts";
8807+
$EditInProfile = "Edit in profile";
8808+
$Guidance = "Guidance";
8809+
$RemoveTime = "Remove time";
8810+
$CopyWithSessionContent = "Copy with session content";
8811+
$ExportByClass = "Export by class";
87958812
?>

‎main/lang/french/trad4all.inc.php

+17
Original file line numberDiff line numberDiff line change
@@ -8724,4 +8724,21 @@
87248724
$CoursesUsage = "Utilisation des cours";
87258725
$HideConnectionTime = "Masquer les temps de connection";
87268726
$CourseInWhichTheQuestionWasInitiallyCreated = "Cours dans lequel la question a été créée initialement.";
8727+
$ApprenticeshipContract = "Contrat d'apprentissage";
8728+
$ExportCcVersion13 = "Exporter à Common Cartridge v1.3";
8729+
$ImportCcVersion13 = "Importer depuis Common Cartridge v1.3";
8730+
$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.";
8731+
$ImportCcVersion13Info = "Importer un cours au format IMS Common Cartridge v1.3, depuis une autre plateforme qui supporte ce format. La version est importante.";
8732+
$IMSCCCreated = "Fichier IMS CC créé.";
8733+
$IMSCCFile = "Fichier IMS CC";
8734+
$IMSCCFileImported = "Fichier IMS CC importé.";
8735+
$IMSCCImportInstructions = "Envoyer un fichier au format IMS CC (.imscc) dans la version correcte, et il sera extrait directement au sein de votre cours.";
8736+
$IMSCC13 = "IMS Common Cartridge v1.3";
8737+
$HideQuestionNumber = "Cacher le numéro des questions";
8738+
$PendingAttempts = "Tentatives en attente";
8739+
$EditInProfile = "Éditer dans le profil";
8740+
$Guidance = "Guidance";
8741+
$RemoveTime = "Supprimer du temps";
8742+
$CopyWithSessionContent = "Copier avec le contenu de session";
8743+
$ExportByClass = "Exporter par classe";
87278744
?>

‎main/lang/spanish/trad4all.inc.php

+17
Original file line numberDiff line numberDiff line change
@@ -8820,4 +8820,21 @@
88208820
$CoursesUsage = "Uso de cursos";
88218821
$HideConnectionTime = "Ocultar tiempo de conexión";
88228822
$CourseInWhichTheQuestionWasInitiallyCreated = "Curso en el cual la pregunta fue creada.";
8823+
$ApprenticeshipContract = "Contrato de aprendizaje";
8824+
$ExportCcVersion13 = "Exportar en Common Cartridge v1.3";
8825+
$ImportCcVersion13 = "Importar desde Common Cartridge v1.3";
8826+
$ExportCcVersion13Info = "Exporte el contenido de su curso en el formato IMS Common Cartridge 1.3, para compartirlo con otras plataformas.";
8827+
$ImportCcVersion13Info = "Importe un curso en el formato IMS Common Cartridge 1.3, desde otra plataforma compatible con este formato. La versión es relevante.";
8828+
$IMSCCCreated = "Archivo IMS CC creado.";
8829+
$IMSCCFile = "Archivo IMS CC";
8830+
$IMSCCFileImported = "Archivo IMS CC importado.";
8831+
$IMSCCImportInstructions = "Suba un archivo IMS CC (.imscc) en la versión correcta y será extraido directamente en su curso.";
8832+
$IMSCC13 = "IMS Common Cartridge v1.3";
8833+
$HideQuestionNumber = "Esconder el número de la pregunta";
8834+
$PendingAttempts = "Intentos en espera";
8835+
$EditInProfile = "Editar en el perfil";
8836+
$Guidance = "Guia";
8837+
$RemoveTime = "Eliminar tiempo";
8838+
$CopyWithSessionContent = "Copiar con contenido de sesión";
8839+
$ExportByClass = "Exportar por clase";
88238840
?>

‎plugin/onlyoffice/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,8 @@ The table below will help you to make the right choice.
138138

139139
\** Support for all conditions and gradient. Adding/Editing capabilities are coming soon
140140

141+
## Note on SSL
142+
143+
As for all SSL to non-SSL communication, this plugin will not work fully if your
144+
Chamilo portal works in HTTP and your OnlyOffice Document server works in HTTPS, or vice-versa.
145+
You will need to ensure the same protocol on both sides.

0 commit comments

Comments
 (0)