Commit Graph

35880 Commits (0ab361c9650c272f3aef30bb12757a883bd6d8c1)
 

Author SHA1 Message Date
Yannick Warnier 1e2db25277 Merge branch 'aragonc-1.11.x' into 1.11.x 9 years ago
Yannick Warnier e5940310b1 Add apiGetHumanDateTime() as a helper function to reduce complexity of api_get_local_time() 9 years ago
David Nos 62736f088b Merge branch 'chamilo/1.11.x' into chamilo-pr/1.11.x 9 years ago
Yannick Warnier 54ea84758b Merge branch '1.11.x' of https://github.com/aragonc/chamilo-lms into 1.11.x 9 years ago
Yannick Warnier f852db08c8 Merge branch 'aragonc-theme-ofaj' into 1.11.x 9 years ago
Yannick Warnier e3bff55355 Minor - Improve documentation - refs BT#10657 9 years ago
Angel Fernando Quiroz Campos a82e76b766 Revert "Fix CALCULATED_ANSWER see #8237" 9 years ago
Angel Fernando Quiroz Campos d3a5c1e8db Revert "Fix questions list with calculated questions - refs #8237" 9 years ago
Angel Fernando Quiroz Campos ee763e8405 Revert "Fix showing resuls for calculated answers - refs #8237" 9 years ago
Angel Fernando Quiroz Campos ee874accf2 Revert "Fix questions list for calculated answers - refs #8237" 9 years ago
Angel Fernando Quiroz Campos 9cb2a9214c Revert "Fix conflict - refs #8237" 9 years ago
Angel Fernando Quiroz Campos 6096b797f6 Revert "Save the calculated answer without whished anser - refs #8237" 9 years ago
Alex Aragon eb52a24c7f fix PR new grid view sessions -refs BT#11017 9 years ago
Yannick Warnier 7ccb6f5ece Merge branch 'theme-ofaj' of https://github.com/aragonc/chamilo-lms into aragonc-theme-ofaj 9 years ago
Yannick Warnier 76bc2407ac Restore support for link to badges from version 1.10 - refs BT#10651 9 years ago
Yannick Warnier ad23ded22d Minor - Indentation 9 years ago
Alex Aragon a395fa9b20 Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x 9 years ago
jmontoyaa c4ddb00704 Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x 9 years ago
jmontoyaa 8f9f57abb5 WIP: vchamilo fixes see BT#11051 9 years ago
Nicolas Ducoulombier 505fa2040d Merge pull request #1163 from jloguercio/pr1108 9 years ago
jmontoyaa dfa2039616 Add md support for plugins. The readme file must be README.md in order to load the markdown conversion. 9 years ago
jmontoyaa c18487259b Merge 1.10.x 9 years ago
nosolored 1eac339bac Fix update_api_key 9 years ago
nosolored f40efabc34 Fix - enable/disable plugins menu, display blank screen 9 years ago
nosolored 2cf9c3ed87 Fix id_coach in session table - refs #8200 9 years ago
Yannick Warnier 22bf412f92 Minor - Fix warning about undefined variable - loosely refs CT#8247 9 years ago
Yannick Warnier f55f3b51a0 Minor - Translated comments to English 9 years ago
Yannick Warnier ff6dd00c0e Minor - Remove useless entity call 9 years ago
Yannick Warnier 99673ffe25 Update subkeytext of name, officialcode and text user fields to allow for translations in the admin settings 9 years ago
Alex Aragon Calixto 03922eb602 Merge pull request #1168 from aragonc/1.10.x 9 years ago
Alex Aragon 1f0b7589bf fix actions bar add class - refs CT#8247 9 years ago
Yannick Warnier 3033f73951 merge 9 years ago
Yannick Warnier b561e66f25 Update language terms 9 years ago
Alex Aragon 6cd10f4fcd fix css div question review - refs CT#8246 9 years ago
Yannick Warnier 7f28b0022b Merge pull request #1111 from jloguercio/10992 9 years ago
Yannick Warnier bceff1fff3 Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x 9 years ago
Yannick Warnier cbca687440 Optimization: remove CKeditor lib from homepage - refs CT#8233 9 years ago
Angel Fernando Quiroz Campos bbcdbe6a6c Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x 9 years ago
Angel Fernando Quiroz Campos a1f39d1250 Save the calculated answer without whished anser - refs #8237 9 years ago
Alex Aragon 2d601888d0 Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x 9 years ago
Alex Aragon de5b18cc6a improving structure search in catalog form session refs BT#11017 9 years ago
José Loguercio e92f421843 Merge pull request #1166 from jloguercio/1.11.x 9 years ago
José Loguercio bb647f4cb0 Added a Link to Course catalog in main navbar if its public - Refs #8243 9 years ago
Alex Aragon ab2eb59757 New grid view catalog session, under structure in the search refs BT#11017 9 years ago
Yannick Warnier b0da587cd4 Apply fix to message submitted by @nicogaldo - refs CT#8248 9 years ago
Yannick Warnier 34fa348ee5 Add filtering on course code and session ID in user information page when removing from a course - loosely refs CT#8248 9 years ago
Yannick Warnier 221d6766a4 Update language terms - Fix 'preguntas minúsculas' in Spanish 9 years ago
Yannick Warnier f4311b2955 Update language terms - Fix 'preguntas minúsculas' in Spanish 9 years ago
Yannick Warnier b80ddb40d1 merge 9 years ago
Yannick Warnier a3e676658c Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x 9 years ago