Merge branch '1.9.x' of github.com:aragonc/chamilo-lms into 1.9.x

11 years ago · f669ff800a
parent 504235226f 753dbfec82
commit f669ff800a
10565 changed files with 168 additions and 18447 deletions
--- a/courses/index.html
+++ b/courses/index.html
--- a/home/default_platform_document/template_thumb/coursetitle.gif
+++ b/home/default_platform_document/template_thumb/coursetitle.gif
--- a/home/home_tabs.html
+++ b/home/home_tabs.html
--- a/home/register_top.html
+++ b/home/register_top.html
--- 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_usergroup_to_url.php
+++ b/main/admin/access_url_add_usergroup_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_check_user_session.php
+++ b/main/admin/access_url_check_user_session.php
--- a/main/admin/access_url_edit.php
+++ b/main/admin/access_url_edit.php
--- a/main/admin/access_url_edit_course_category_to_url.php
+++ b/main/admin/access_url_edit_course_category_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_usergroup_to_url.php
+++ b/main/admin/access_url_edit_usergroup_to_url.php
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
--- a/main/admin/add_courses_to_usergroup.php
+++ b/main/admin/add_courses_to_usergroup.php
--- a/main/admin/add_many_session_to_category.php
+++ b/main/admin/add_many_session_to_category.php
--- a/main/admin/add_sessions_to_promotion.php
+++ b/main/admin/add_sessions_to_promotion.php
--- a/main/admin/add_sessions_to_usergroup.php
+++ b/main/admin/add_sessions_to_usergroup.php
--- a/main/admin/add_students_to_session.php
+++ b/main/admin/add_students_to_session.php
--- a/main/admin/add_teachers_to_session.php
+++ b/main/admin/add_teachers_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/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
--- a/main/admin/admin_page.class.php
+++ b/main/admin/admin_page.class.php
--- a/main/admin/archive_cleanup.php
+++ b/main/admin/archive_cleanup.php
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
--- a/main/admin/calendar_ical_export.php
+++ b/main/admin/calendar_ical_export.php
--- a/main/admin/calendar_tbl_change.js
+++ b/main/admin/calendar_tbl_change.js
--- a/main/admin/calendar_view.php
+++ b/main/admin/calendar_view.php
--- a/main/admin/calendar_view_print.php
+++ b/main/admin/calendar_view_print.php
--- a/main/admin/career_dashboard.php
+++ b/main/admin/career_dashboard.php
--- a/main/admin/careers.php
+++ b/main/admin/careers.php
--- a/main/admin/class_add.php
+++ b/main/admin/class_add.php
--- a/main/admin/class_edit.php
+++ b/main/admin/class_edit.php
--- a/main/admin/class_import.php
+++ b/main/admin/class_import.php
--- a/main/admin/class_information.php
+++ b/main/admin/class_information.php
--- a/main/admin/class_list.php
+++ b/main/admin/class_list.php
--- a/main/admin/class_user_import.php
+++ b/main/admin/class_user_import.php
--- a/main/admin/cli.php
+++ b/main/admin/cli.php
--- a/main/admin/configure_extensions.php
+++ b/main/admin/configure_extensions.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/configure_plugin.php
+++ b/main/admin/configure_plugin.php
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
--- a/main/admin/course_category.php
+++ b/main/admin/course_category.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_import.php
+++ b/main/admin/course_import.php
--- a/main/admin/course_information.php
+++ b/main/admin/course_information.php
--- a/main/admin/course_intro_pdf_import.php
+++ b/main/admin/course_intro_pdf_import.php
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
--- a/main/admin/course_request_accepted.php
+++ b/main/admin/course_request_accepted.php
--- a/main/admin/course_request_edit.php
+++ b/main/admin/course_request_edit.php
--- a/main/admin/course_request_rejected.php
+++ b/main/admin/course_request_rejected.php
--- a/main/admin/course_request_review.php
+++ b/main/admin/course_request_review.php
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
--- a/main/admin/course_virtual.php
+++ b/main/admin/course_virtual.php
--- a/main/admin/dashboard_add_courses_to_user.php
+++ b/main/admin/dashboard_add_courses_to_user.php
--- a/main/admin/dashboard_add_sessions_to_user.php
+++ b/main/admin/dashboard_add_sessions_to_user.php
--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
--- a/main/admin/event_controller.php
+++ b/main/admin/event_controller.php
--- a/main/admin/event_type.php
+++ b/main/admin/event_type.php
--- a/main/admin/example.csv
+++ b/main/admin/example.csv
--- a/main/admin/example.xml
+++ b/main/admin/example.xml
--- a/main/admin/example_class.csv
+++ b/main/admin/example_class.csv
--- a/main/admin/example_session.xml
+++ b/main/admin/example_session.xml
--- a/main/admin/filler.php
+++ b/main/admin/filler.php
--- a/main/admin/grade_models.php
+++ b/main/admin/grade_models.php
--- a/main/admin/group_add.php
+++ b/main/admin/group_add.php
--- a/main/admin/group_edit.php
+++ b/main/admin/group_edit.php
--- a/main/admin/group_list.php
+++ b/main/admin/group_list.php
--- a/main/admin/inactive_user_list.php
+++ b/main/admin/inactive_user_list.php
--- a/main/admin/index.php
+++ b/main/admin/index.php
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
--- a/main/admin/ldap_form_add_users_group.php
+++ b/main/admin/ldap_form_add_users_group.php
--- a/main/admin/ldap_import_students.php
+++ b/main/admin/ldap_import_students.php
--- a/main/admin/ldap_import_students_to_session.php
+++ b/main/admin/ldap_import_students_to_session.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/legal_add.php
+++ b/main/admin/legal_add.php
--- a/main/admin/legal_list.php
+++ b/main/admin/legal_list.php
--- a/main/admin/promotions.php
+++ b/main/admin/promotions.php
--- a/main/admin/resume_session.php
+++ b/main/admin/resume_session.php
--- a/main/admin/session_add.php
+++ b/main/admin/session_add.php
--- a/main/admin/session_category_add.php
+++ b/main/admin/session_category_add.php
--- a/main/admin/session_category_edit.php
+++ b/main/admin/session_category_edit.php
--- a/main/admin/session_category_list.php
+++ b/main/admin/session_category_list.php
--- a/main/admin/session_course_edit.php
+++ b/main/admin/session_course_edit.php
--- a/main/admin/session_course_list.php
+++ b/main/admin/session_course_list.php
--- a/main/admin/session_course_user.php
+++ b/main/admin/session_course_user.php
--- a/main/admin/session_course_user_list.php
+++ b/main/admin/session_course_user_list.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_import.php
+++ b/main/admin/session_import.php
--- a/main/admin/session_import_drh.php
+++ b/main/admin/session_import_drh.php
--- a/main/admin/session_list.php
+++ b/main/admin/session_list.php
--- a/main/admin/session_user_import.php
+++ b/main/admin/session_user_import.php
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
--- a/Show More
+++ b/Show More