Julio Montoya
|
438ab1bfa3
|
Updating vendors
|
12 years ago |
|
Julio Montoya
|
3b6ab4fcd0
|
Updating vendors
|
12 years ago |
|
Julio Montoya
|
89b74a4af9
|
Merge with new features branch (mine)
|
12 years ago |
|
Julio Montoya
|
bb72d7d74a
|
Merge branch 'chamilo19'
|
12 years ago |
|
Julio Montoya
|
dc6ccd26ff
|
Fixing function calls statistics to Statistics
|
12 years ago |
|
Julio Montoya
|
7d39a6199a
|
Fixing version check for 1.10
|
12 years ago |
|
Julio Montoya
|
80fc2e8d3d
|
Merge branch 'chamilo19'
Conflicts:
main/admin/index.php
main/exercice/hotpotatoes.lib.php
main/exercice/question_list_admin.inc.php
main/gradebook/lib/be/exerciselink.class.php
main/inc/ajax/admin.ajax.php
main/inc/ajax/user_manager.ajax.php
main/inc/lib/main_api.lib.php
main/inc/lib/usermanager.lib.php
main/lang/english/admin.inc.php
main/lang/english/exercice.inc.php
main/lang/english/trad4all.inc.php
main/lang/polish/admin.inc.php
main/lang/polish/document.inc.php
main/lang/spanish/admin.inc.php
main/lang/spanish/exercice.inc.php
main/lang/spanish/trad4all.inc.php
main/template/default/admin/settings_index.tpl
|
12 years ago |
|
Julio Montoya
|
db1d55e30c
|
Minor- formating code
|
12 years ago |
|
Julio Montoya
|
7946450589
|
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666
|
12 years ago |
|
Julio Montoya
|
0eb58f2b24
|
Fixing version check via ajax see #6216
|
12 years ago |
|
Julio Montoya
|
ca198a488b
|
Minor - format code
|
12 years ago |
|
Julio Montoya
|
01d4bbd5e6
|
Fixing course description link.
|
12 years ago |
|
Julio Montoya
|
f1643bf5e7
|
Fixing error due recent merge
|
12 years ago |
|
Julio Montoya
|
e6a6c08c28
|
Merge branch 'chamilo19'
Conflicts:
404.php
documentation/changelog.html
documentation/dependencies.html
documentation/installation_guide.html
documentation/optimization.html
main/admin/careers.php
main/admin/course_category.php
main/admin/course_edit.php
main/admin/course_import.php
main/admin/index.php
main/admin/session_import.php
main/admin/session_list.php
main/admin/user_add.php
main/admin/user_list.php
main/auth/courses.php
main/auth/courses_controller.php
main/auth/inscription.php
main/auth/profile.php
main/calendar/agenda.inc.php
main/calendar/agenda.lib.php
main/coursecopy/classes/Announcement.class.php
main/coursecopy/classes/Attendance.class.php
main/coursecopy/classes/Course.class.php
main/coursecopy/classes/CourseArchiver.class.php
main/coursecopy/classes/CourseBuilder.class.php
main/coursecopy/classes/CourseRecycler.class.php
main/coursecopy/classes/CourseRestorer.class.php
main/coursecopy/classes/CourseSelectForm.class.php
main/css/base.css
main/css/bootstrap.css
main/css/chamilo/images/header-logo.png
main/css/responsive.css
main/document/create_audio.php
main/document/document.php
main/document/download.php
main/exercice/answer.class.php
main/exercice/exercise.class.php
main/exercice/exercise.lib.php
main/exercice/exercise_result.class.php
main/exercice/exercise_result.php
main/exercice/exercise_show.php
main/exercice/exercise_submit.php
main/exercice/fill_blanks.class.php
main/exercice/question.class.php
main/exercice/question_list_admin.inc.php
main/exercice/question_pool.php
main/exercice/testcategory.class.php
main/gradebook/index.php
main/gradebook/lib/be/category.class.php
main/gradebook/lib/fe/flatviewtable.class.php
main/gradebook/lib/scoredisplay.class.php
main/inc/ajax/agenda.ajax.php
main/inc/ajax/exercise.ajax.php
main/inc/ajax/model.ajax.php
main/inc/global.inc.php
main/inc/lib/add_course.lib.inc.php
main/inc/lib/add_courses_to_session_functions.lib.php
main/inc/lib/autoload.class.php
main/inc/lib/banner.lib.php
main/inc/lib/career.lib.php
main/inc/lib/course.lib.php
main/inc/lib/course_home.lib.php
main/inc/lib/display.lib.php
main/inc/lib/document.lib.php
main/inc/lib/exercise_show_functions.lib.php
main/inc/lib/groupmanager.lib.php
main/inc/lib/javascript/jqgrid/js/jquery.jqGrid.min.js
main/inc/lib/javascript/jquery.lp_minipanel.js
main/inc/lib/link.lib.php
main/inc/lib/log.class.php
main/inc/lib/login.lib.php
main/inc/lib/main_api.lib.php
main/inc/lib/message.lib.php
main/inc/lib/pear/HTML/QuickForm.php
main/inc/lib/promotion.lib.php
main/inc/lib/security.lib.php
main/inc/lib/sessionmanager.lib.php
main/inc/lib/symfony/Monolog/Handler/NativeMailerHandler.php
main/inc/lib/usermanager.lib.php
main/inc/lib/userportal.lib.php
main/inc/local.inc.php
main/install/index.php
main/install/update-db-1.8.7-1.8.8.inc.php
main/install/version.php
main/lang/basque/course_info.inc.php
main/lang/english/trad4all.inc.php
main/lang/greek/admin.inc.php
main/lang/greek/course_home.inc.php
main/lang/greek/courses.inc.php
main/lang/greek/messages.inc.php
main/lang/greek/registration.inc.php
main/lang/greek/reservation.inc.php
main/lang/greek/survey.inc.php
main/lang/greek/trad4all.inc.php
main/lang/spanish/admin.inc.php
main/lang/spanish/trad4all.inc.php
main/mySpace/index.php
main/newscorm/learnpath.class.php
main/newscorm/scorm_api.php
main/social/search.php
main/survey/survey.lib.php
main/template/default/admin/settings_index.tpl
main/template/default/agenda/month.tpl
main/template/default/layout/footer.tpl
main/template/default/layout/head.tpl
main/template/default/layout/login_form.tpl
main/upload/upload_word.php
main/user/user_import.php
main/wiki/wiki.inc.php
main/work/view.php
main/work/work.lib.php
main/work/work.php
tests/phpunit/classes/UserManagerTest.lib.php
|
12 years ago |
|
Yannick Warnier
|
391cc06316
|
Merge pull request #94 from ycastillo/yoselyn.5994
Adding hotpotatoe type in assessments -refs #5994
|
12 years ago |
|
Yannick Warnier
|
dcdd603d67
|
Better fix for quotes escaping issue in exercises - refs #5751
|
12 years ago |
|
Yannick Warnier
|
3f6215fa2a
|
Updated translations - refs #6173
|
12 years ago |
|
Yannick Warnier
|
7c1cb6ffae
|
Work: fixed a few local date issues and column names in assignments - refs BT#6418
|
12 years ago |
|
Yannick Warnier
|
76b50a5f21
|
Updated translations - refs #6173
|
12 years ago |
|
Julio Montoya
|
9a6e72760b
|
Minor - removing var_dump
|
12 years ago |
|
Yannick Warnier
|
3e4fef217e
|
Fixed and extended feature patch for logging of users enabling/disabling - refs #6213
|
12 years ago |
|
Julio Montoya
|
93334257c2
|
Removing message/social links when the message tool is disable see BT#6575
|
12 years ago |
|
Julio Montoya
|
8e42a76163
|
Fixing tpl errors + adding validation if course/session are not set.
|
12 years ago |
|
Julio Montoya
|
f9e4145fa5
|
Using setCourseParameters() in order to modify the query builder to inject course and session conditions.
|
12 years ago |
|
Julio Montoya
|
4c6185f26a
|
Using CSS class instead of width see BT#6509
|
12 years ago |
|
Julio Montoya
|
24ebb128cd
|
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666
|
12 years ago |
|
Julio Montoya
|
d836943c52
|
Fixing width input in Fill in blanks see BT#6509
|
12 years ago |
|
Julio Montoya
|
5a205ad0cd
|
Removing nl2br don't modify the text enter by the teacher.
|
12 years ago |
|
Julio Montoya
|
a8347fffc7
|
Minor - format code
|
12 years ago |
|
Julio Montoya
|
9c454420b6
|
Merge
|
12 years ago |
|
Julio Montoya
|
3880cfc04a
|
Adding course middleware in order to inject course/session roles as Symfony2 Roles ROLE_* (not yet used)
|
12 years ago |
|
Julio Montoya
|
b97d438feb
|
Update composer.lock
|
12 years ago |
|
Julio Montoya
|
34dc416bbb
|
Inyecting course and session.
|
12 years ago |
|
Julio Montoya
|
2044df3b2d
|
Adding session ids in the curriculum tool.
|
12 years ago |
|
Yannick Warnier
|
6fed0b3233
|
Updated logo to SVG - might require modified for IE<9
|
12 years ago |
|
Julio Montoya
|
5b5e08187a
|
Minor format code.
|
12 years ago |
|
Julio Montoya
|
d82d66ecd2
|
Setting course and session.
|
12 years ago |
|
Julio Montoya
|
2709a1544e
|
Curriculum tool now belongs to a course c_id is added when saving/updating.
|
12 years ago |
|
Julio Montoya
|
58cde3d5e6
|
Removing unused files
|
12 years ago |
|
Julio Montoya
|
3580e7b309
|
Updating vendor
|
12 years ago |
|
Julio Montoya
|
6f5ecb15d9
|
Updating gitignore
|
12 years ago |
|
Hubert Borderiou
|
262a5f11c4
|
Display first lines of gredebook object description in gredebook table - ref #6588
|
12 years ago |
|
Julio Montoya
|
6d4c93bf23
|
Fixing curriculum tool now redirecting from courses/ABC/curriculum/ to courses/ABC/curriculum/user
|
12 years ago |
|
Julio Montoya
|
1be3d64db0
|
virtual keyboard js is only load in the index page see BT#6579
|
12 years ago |
|
Julio Montoya
|
3131862251
|
Fixing tpl error.
|
12 years ago |
|
Julio Montoya
|
8fc49f9443
|
Adding CSV example.
|
12 years ago |
|
Julio Montoya
|
a4b86fca87
|
Reading the Username, username, Id or id rows when importing users to a course see BT#5848
|
12 years ago |
|
Julio Montoya
|
33fe03110e
|
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666
|
12 years ago |
|
Julio Montoya
|
e678def7c4
|
Adding hotspot type and coordinates when updating answer see #6310
|
12 years ago |
|
Yannick Warnier
|
c6d3ca1890
|
Added copy of work/assignments to coursecopy - refs #6599
|
12 years ago |
