Julio Montoya
|
647f441934
Minor - adding comments
|
11 years ago |
Julio Montoya
|
3863421431
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julio Montoya
|
4e0068d992
Adding only *some* css and js files when assetic is enabled. Adding function in order to get the stylesheets folders. See BT#6264
|
11 years ago |
Julio Montoya
|
735294d28b
Merge
|
11 years ago |
Julio Montoya
|
2180e7e9c1
Setting URL information in session in order to avoid hitting the DB
|
11 years ago |
Julio Montoya
|
5d854994c0
Minor - cosmetic changes
|
11 years ago |
Julio Montoya
|
36bd70294c
Improving performance: Function CourseManager::get_emails_of_tutors_to_course() was hitting the DB many times in orde to get teachers name like this:
|
11 years ago |
Julio Montoya
|
a97d55def8
Adding assetic disabled parameters in order to load the style.css unique file
|
11 years ago |
Julio Montoya
|
6f789286c0
Fixing SCORM import due folder changes + updating htaccess files
|
11 years ago |
Julio Montoya
|
b4bc5e1052
Uploading Font awesome v3.1.0 see #5160
|
11 years ago |
Julio Montoya
|
7dc937fc96
Merge
|
11 years ago |
Julio Montoya
|
f1eb820624
Minor - format code
|
11 years ago |
Julio Montoya
|
fc7fb86309
Adding "template" setting that allows change the template files '*.tpl' see BT#6214
|
11 years ago |
Julio Montoya
|
c2c22dd9d7
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julio Montoya
|
a65b60b88b
Fixing hidden navigation links
|
11 years ago |
Julio Montoya
|
1c4fb4117e
merge
|
11 years ago |
Julio Montoya
|
4b04d193f2
Adding the header logo in the template instead of PHP
|
11 years ago |
Julio Montoya
|
0af851e415
Adding end_button setting in exercises see BT#6221
|
11 years ago |
Julio Montoya
|
0b636c4334
Merge
|
11 years ago |
Julio Montoya
|
27d7a1003c
Adding new question tool table with extra fields using jqgrid
|
11 years ago |
Julio Montoya
|
5473716606
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julio Montoya
|
98ba3d104e
Adding "elfinder chamilo connector" as a controller, in order to not modified the elfinder default files. This way we can update elfinder and ckeditor in any moment.
|
11 years ago |
Julio Montoya
|
ea254e0ace
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julio Montoya
|
c5a90d0ba7
Fixing lang menu in the login page. It was set always with the first item.
|
11 years ago |
Julio Montoya
|
e1b5e8a975
Installing ckeditor 4.1.1 in Chamilo in order to return to the old fckeditor just undo this change.
|
11 years ago |
Julio Montoya
|
bbd1a7a2ef
Merge
|
11 years ago |
Julio Montoya
|
670c464234
Minor - changing function names
|
11 years ago |
Julio Montoya
|
a8f15b0705
Merge remote-tracking branch 'upstream/master'
|
11 years ago |
Julio Montoya
|
876771ea9c
Saving memory issues, do not load classes if we don't need it
|
11 years ago |
Julio Montoya
|
71f4120239
Merge remote-tracking branch 'upstream/master'
|
11 years ago |