Merge

15 years ago · 7e6d3fe199
parent 1acf605f6d 3b0d5ad8b3
commit 7e6d3fe199
878 changed files with 17 additions and 3 deletions
--- a/documentation/changelog.html
+++ b/documentation/changelog.html
--- a/documentation/credits.html
+++ b/documentation/credits.html
--- a/documentation/index.html
+++ b/documentation/index.html
--- a/documentation/installation_guide.html
+++ b/documentation/installation_guide.html
--- a/documentation/installation_guide_es_ES.html
+++ b/documentation/installation_guide_es_ES.html
--- a/documentation/readme.html
+++ b/documentation/readme.html
--- a/index.php
+++ b/index.php
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
--- a/main/admin/configure_inscription.php
+++ b/main/admin/configure_inscription.php
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
--- a/main/admin/course_edit.php
+++ b/main/admin/course_edit.php
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
--- a/main/admin/course_virtual.php
+++ b/main/admin/course_virtual.php
--- a/main/admin/group_add.php
+++ b/main/admin/group_add.php
--- a/main/admin/group_list.php
+++ b/main/admin/group_list.php
--- a/main/admin/index.php
+++ b/main/admin/index.php
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.php
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
--- a/main/admin/session_add.php
+++ b/main/admin/session_add.php
--- a/main/admin/session_course_user.php
+++ b/main/admin/session_course_user.php
--- a/main/admin/session_edit.php
+++ b/main/admin/session_edit.php
--- a/main/admin/session_export.php
+++ b/main/admin/session_export.php
--- a/main/admin/session_list.php
+++ b/main/admin/session_list.php
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
--- a/main/admin/statistics/statistics.lib.php
+++ b/main/admin/statistics/statistics.lib.php
--- a/main/admin/style_preview.php
+++ b/main/admin/style_preview.php
--- a/main/admin/sub_language.class.php
+++ b/main/admin/sub_language.class.php
--- a/main/admin/subscribe_user2course.php
+++ b/main/admin/subscribe_user2course.php
--- a/main/admin/system_announcements.php
+++ b/main/admin/system_announcements.php
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
--- a/main/admin/user_edit.php
+++ b/main/admin/user_edit.php
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
--- a/main/admin/user_fields.php
+++ b/main/admin/user_fields.php
--- a/main/admin/user_fields_add.php
+++ b/main/admin/user_fields_add.php
--- a/main/admin/user_import.php
+++ b/main/admin/user_import.php
--- a/main/admin/user_information.php
+++ b/main/admin/user_information.php
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
--- a/main/app_share/appshare.php
+++ b/main/app_share/appshare.php
--- a/main/app_share/index.php
+++ b/main/app_share/index.php
--- a/main/attendance/attendance_add.php
+++ b/main/attendance/attendance_add.php
--- a/main/attendance/attendance_calendar.php
+++ b/main/attendance/attendance_calendar.php
--- a/main/attendance/attendance_edit.php
+++ b/main/attendance/attendance_edit.php
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
--- a/main/auth/courses.php
+++ b/main/auth/courses.php
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
--- a/main/auth/my_progress.php
+++ b/main/auth/my_progress.php
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
--- a/main/calendar/agenda.php
+++ b/main/calendar/agenda.php
--- a/main/calendar/myagenda.inc.php
+++ b/main/calendar/myagenda.inc.php
--- a/main/conference/index.php
+++ b/main/conference/index.php
--- a/main/course_info/download.php
+++ b/main/course_info/download.php
--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
--- a/main/course_info/postpone.php
+++ b/main/course_info/postpone.php
--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
--- a/main/course_progress/thematic_advance.php
+++ b/main/course_progress/thematic_advance.php
--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
--- a/main/coursecopy/classes/CourseSelectForm.class.php
+++ b/main/coursecopy/classes/CourseSelectForm.class.php
--- a/main/create_course/add_course.php
+++ b/main/create_course/add_course.php
--- a/main/cron/user_import/client.php
+++ b/main/cron/user_import/client.php
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
--- a/main/css/chamilo_electric_blue/default.css
+++ b/main/css/chamilo_electric_blue/default.css
--- a/main/css/chamilo_green/default.css
+++ b/main/css/chamilo_green/default.css
--- a/main/css/chamilo_orange/default.css
+++ b/main/css/chamilo_orange/default.css
--- a/main/css/chamilo_red/default.css
+++ b/main/css/chamilo_red/default.css
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
--- a/main/document/document.php
+++ b/main/document/document.php
--- a/main/document/downloadfolder.inc.php
+++ b/main/document/downloadfolder.inc.php
--- a/main/document/edit_document.php
+++ b/main/document/edit_document.php
--- a/main/document/slideshow.php
+++ b/main/document/slideshow.php
--- a/main/document/upload.php
+++ b/main/document/upload.php
--- a/main/dropbox/dropbox_class.inc.php
+++ b/main/dropbox/dropbox_class.inc.php
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
--- a/main/dropbox/dropbox_init.inc.php
+++ b/main/dropbox/dropbox_init.inc.php
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
--- a/main/exercice/answer.class.php
+++ b/main/exercice/answer.class.php
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
--- a/main/exercice/exercise_admin.php
+++ b/main/exercice/exercise_admin.php
--- a/main/exercice/exercise_result.class.php
+++ b/main/exercice/exercise_result.class.php
--- a/main/exercice/exercise_result.php
+++ b/main/exercice/exercise_result.php
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
--- a/main/exercice/exercise_submit_modal.php
+++ b/main/exercice/exercise_submit_modal.php
--- a/main/exercice/hotpotatoes.lib.php
+++ b/main/exercice/hotpotatoes.lib.php
--- a/main/exercice/hotpotatoes.php
+++ b/main/exercice/hotpotatoes.php
--- a/main/exercice/hotspot.inc.php
+++ b/main/exercice/hotspot.inc.php
--- a/main/exercice/qti2.php
+++ b/main/exercice/qti2.php
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
--- a/Show More
+++ b/Show More