Merge

13 years ago · 4834d759a7
parent 16f66208fa 72338556d6
commit 4834d759a7
297 changed files with 130 additions and 11 deletions
--- a/documentation/dependencies.html
+++ b/documentation/dependencies.html
--- a/license.txt
+++ b/license.txt
--- a/main/admin/access_url_add_courses_to_url.php
+++ b/main/admin/access_url_add_courses_to_url.php
--- a/main/admin/access_url_add_sessions_to_url.php
+++ b/main/admin/access_url_add_sessions_to_url.php
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
--- a/main/admin/access_url_edit_sessions_to_url.php
+++ b/main/admin/access_url_edit_sessions_to_url.php
--- a/main/admin/add_many_session_to_category.php
+++ b/main/admin/add_many_session_to_category.php
--- a/main/admin/course_create_content.php
+++ b/main/admin/course_create_content.php
--- a/main/admin/course_virtual.php
+++ b/main/admin/course_virtual.php
--- a/main/admin/ldap_synchro.php
+++ b/main/admin/ldap_synchro.php
--- a/main/admin/ldap_users_list.php
+++ b/main/admin/ldap_users_list.php
--- a/main/admin/ldap_users_synchro.php
+++ b/main/admin/ldap_users_synchro.php
--- a/main/admin/statistics/index.php
+++ b/main/admin/statistics/index.php
--- a/main/admin/subscribe_class2course.php
+++ b/main/admin/subscribe_class2course.php
--- a/main/admin/subscribe_user2class.php
+++ b/main/admin/subscribe_user2class.php
--- a/main/admin/system_status.php
+++ b/main/admin/system_status.php
--- a/main/attendance/attendance_list.php
+++ b/main/attendance/attendance_list.php
--- a/main/auth/ldap/authldap.php
+++ b/main/auth/ldap/authldap.php
--- a/main/auth/ldap/ldap_var.inc.php
+++ b/main/auth/ldap/ldap_var.inc.php
--- a/main/auth/ldap/login.php
+++ b/main/auth/ldap/login.php
--- a/main/auth/ldap/newUser.php
+++ b/main/auth/ldap/newUser.php
--- a/main/auth/lost_password.lib.php
+++ b/main/auth/lost_password.lib.php
--- a/main/auth/openid/login.php
+++ b/main/auth/openid/login.php
--- a/main/auth/openid/openid.conf.php
+++ b/main/auth/openid/openid.conf.php
--- a/main/auth/openid/openid.lib.php
+++ b/main/auth/openid/openid.lib.php
--- a/main/auth/openid/whatis.php
+++ b/main/auth/openid/whatis.php
--- a/main/auth/openid/xrds.lib.php
+++ b/main/auth/openid/xrds.lib.php
--- a/main/blog/calendar.php
+++ b/main/blog/calendar.php
--- a/main/calendar/allagendas.php
+++ b/main/calendar/allagendas.php
--- a/main/calendar/myagenda.php
+++ b/main/calendar/myagenda.php
--- a/main/chat/chat.php
+++ b/main/chat/chat.php
--- a/main/chat/header_frame.inc.php
+++ b/main/chat/header_frame.inc.php
--- a/main/course_info/delete_course.php
+++ b/main/course_info/delete_course.php
--- a/main/course_info/download.lib.php
+++ b/main/course_info/download.lib.php
--- a/main/course_info/download.php
+++ b/main/course_info/download.php
--- a/main/course_info/maintenance.php
+++ b/main/course_info/maintenance.php
--- a/main/course_info/postpone.php
+++ b/main/course_info/postpone.php
--- a/main/course_progress/layout.php
+++ b/main/course_progress/layout.php
--- a/main/course_progress/thematic_controller.php
+++ b/main/course_progress/thematic_controller.php
--- a/main/coursecopy/backup.php
+++ b/main/coursecopy/backup.php
--- a/main/coursecopy/classes/Announcement.class.php
+++ b/main/coursecopy/classes/Announcement.class.php
--- a/main/coursecopy/classes/CourseArchiver.class.php
+++ b/main/coursecopy/classes/CourseArchiver.class.php
--- a/main/coursecopy/classes/CourseSession.class.php
+++ b/main/coursecopy/classes/CourseSession.class.php
--- a/main/coursecopy/classes/Document.class.php
+++ b/main/coursecopy/classes/Document.class.php
--- a/main/coursecopy/classes/DummyCourseCreator.class.php
+++ b/main/coursecopy/classes/DummyCourseCreator.class.php
--- a/main/coursecopy/classes/Event.class.php
+++ b/main/coursecopy/classes/Event.class.php
--- a/main/coursecopy/classes/Forum.class.php
+++ b/main/coursecopy/classes/Forum.class.php
--- a/main/coursecopy/classes/ForumCategory.class.php
+++ b/main/coursecopy/classes/ForumCategory.class.php
--- a/main/coursecopy/classes/ForumPost.class.php
+++ b/main/coursecopy/classes/ForumPost.class.php
--- a/main/coursecopy/classes/ForumTopic.class.php
+++ b/main/coursecopy/classes/ForumTopic.class.php
--- a/main/coursecopy/classes/Glossary.class.php
+++ b/main/coursecopy/classes/Glossary.class.php
--- a/main/coursecopy/classes/LinkCategory.class.php
+++ b/main/coursecopy/classes/LinkCategory.class.php
--- a/main/coursecopy/classes/Quiz.class.php
+++ b/main/coursecopy/classes/Quiz.class.php
--- a/main/coursecopy/classes/QuizQuestion.class.php
+++ b/main/coursecopy/classes/QuizQuestion.class.php
--- a/main/coursecopy/classes/ScormDocument.class.php
+++ b/main/coursecopy/classes/ScormDocument.class.php
--- a/main/coursecopy/classes/SurveyInvitation.class.php
+++ b/main/coursecopy/classes/SurveyInvitation.class.php
--- a/main/coursecopy/classes/ToolIntro.class.php
+++ b/main/coursecopy/classes/ToolIntro.class.php
--- a/main/coursecopy/classes/wiki.class.php
+++ b/main/coursecopy/classes/wiki.class.php
--- a/main/coursecopy/create_backup.php
+++ b/main/coursecopy/create_backup.php
--- a/main/coursecopy/import_backup.php
+++ b/main/coursecopy/import_backup.php
--- a/main/coursecopy/recycle_course.php
+++ b/main/coursecopy/recycle_course.php
--- a/main/css/public_admin/scorm.css
+++ b/main/css/public_admin/scorm.css
--- a/main/document/download.php
+++ b/main/document/download.php
--- a/main/document/footerpage.php
+++ b/main/document/footerpage.php
--- a/main/document/headerpage.php
+++ b/main/document/headerpage.php
--- a/main/document/quota.php
+++ b/main/document/quota.php
--- a/main/document/showinframes.php
+++ b/main/document/showinframes.php
--- a/main/document/slideshow.inc.php
+++ b/main/document/slideshow.inc.php
--- a/main/document/slideshowoptions.php
+++ b/main/document/slideshowoptions.php
--- a/main/dropbox/dropbox_init.inc.php
+++ b/main/dropbox/dropbox_init.inc.php
--- a/main/dropbox/dropbox_submit.php
+++ b/main/dropbox/dropbox_submit.php
--- a/main/dropbox/index.php
+++ b/main/dropbox/index.php
--- a/main/exercice/GC.php
+++ b/main/exercice/GC.php
--- a/main/exercice/Hpdownload.php
+++ b/main/exercice/Hpdownload.php
--- a/main/exercice/exercise_submit_modal.php
+++ b/main/exercice/exercise_submit_modal.php
--- a/main/exercice/export/exercise_import.inc.php
+++ b/main/exercice/export/exercise_import.inc.php
--- a/main/exercice/export/exercise_import.php
+++ b/main/exercice/export/exercise_import.php
--- a/main/exercice/export/index.php
+++ b/main/exercice/export/index.php
--- a/main/exercice/export/qti/qti_classes.php
+++ b/main/exercice/export/qti/qti_classes.php
--- a/main/exercice/export/qti/qti_export.php
+++ b/main/exercice/export/qti/qti_export.php
--- a/main/exercice/export/qti2/qti2_classes.php
+++ b/main/exercice/export/qti2/qti2_classes.php
--- a/main/exercice/export/qti2/qti2_export.php
+++ b/main/exercice/export/qti2/qti2_export.php
--- a/main/exercice/export/scorm/scorm_classes.php
+++ b/main/exercice/export/scorm/scorm_classes.php
--- a/main/exercice/export/scorm/scorm_export.php
+++ b/main/exercice/export/scorm/scorm_export.php
--- a/main/exercice/feedback.php
+++ b/main/exercice/feedback.php
--- a/main/exercice/hotspot.inc.php
+++ b/main/exercice/hotspot.inc.php
--- a/main/exercice/hotspot_lang_conversion.php
+++ b/main/exercice/hotspot_lang_conversion.php
--- a/main/exercice/hotspot_savescore.inc.php
+++ b/main/exercice/hotspot_savescore.inc.php
--- a/main/exercice/hotspot_updatescore.inc.php
+++ b/main/exercice/hotspot_updatescore.inc.php
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
--- a/main/exercice/testheaderpage.php
+++ b/main/exercice/testheaderpage.php
--- a/main/glossary/glossary_ajax_request.php
+++ b/main/glossary/glossary_ajax_request.php
--- a/main/gradebook/gradebook_add_link_select_course.php
+++ b/main/gradebook/gradebook_add_link_select_course.php
--- a/main/gradebook/gradebook_add_result.php
+++ b/main/gradebook/gradebook_add_result.php
--- a/main/gradebook/gradebook_add_user.php
+++ b/main/gradebook/gradebook_add_user.php
--- a/main/gradebook/gradebook_edit_eval.php
+++ b/main/gradebook/gradebook_edit_eval.php
--- a/main/gradebook/gradebook_edit_result.php
+++ b/main/gradebook/gradebook_edit_result.php
--- a/main/gradebook/gradebook_scoring_system.php
+++ b/main/gradebook/gradebook_scoring_system.php
--- a/main/gradebook/gradebook_showlog_link.php
+++ b/main/gradebook/gradebook_showlog_link.php
--- a/Show More
+++ b/Show More