Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.0-rc

Author: ywarnier

.htaccess

@@ -37,3 +37,6 @@ RewriteRule ^courses/([^/]+)/course-pic.png$ app/courses/$1/course-pic.png [QSA,
 
 # About session
 RewriteRule ^session/(\d{1,})/about/?$ main/session/about.php?session_id=$1 [L]
+
+# Issued badges friendly URL
+RewriteRule ^badge/(\d{1,})/user/(\d{1,}) main/badge/issued.php?skill=$1&user=$2 [L]

app/Resources/public/css/base.css

@@ -2638,13 +2638,6 @@ form .formw .freeze {
   background-color: #FFFFFF;
 }
 .skill-options .load_wheel{
-  -moz-border-radius:6px;
-  -webkit-border-radius:6px;
-  border-radius:6px;
-  border:1px solid #C09853;
-  background:#FCF8E3;
-  padding:1px 5px 2px;
-  color:#333;
 }
 .skill-options .skill-winner{
   list-style: none;
@@ -2676,8 +2669,8 @@ form .formw .freeze {
 .skill-legend-badges{
   color: #3A87AD;
 }
-.page-skill .panel-heading a{
-  color: #ffffff;
+.page-skill .panel-default{
+    border-color:#DDDDDD;
 }
 .page-skill .btn-default{
   background-color: #F6F6F6;
@@ -2699,11 +2692,19 @@ form .formw .freeze {
   stroke: #000000;
   stroke-width: 0.5px;
 }
-
-#skill_holder li {
-  float: none;
-  padding-right: 10px;
-  margin-bottom: .5em;
+.items-user .avatar-user{
+    text-align: center;
+    margin-bottom: 10px;
+}
+.items-user p{
+    font-size: 12px;
+    margin-bottom: 5px;
+}
+.items-user .list-group{
+    font-size: 12px;
+}
+table#skill_holder {
+  margin-top: 15px;
 }
 
 /* ****************************************************
@@ -4038,6 +4039,19 @@ i.size-32.icon-new-work{
 .openbadges-text{
   text-align: center;
 }
+.title-badge{
+  font-weight: bold;
+  color: #2C3E50;
+}
+.code-badge{
+  font-size: 12px;
+}
+.name-badge{
+  font-size: 16px;
+}
+.issued .thumbnail{
+    border: none;
+}
 /* Social Profile */
 
 .social-profile{
@@ -5011,9 +5025,10 @@ div#chat-remote-video video {
   text-transform: uppercase;
 }
 #session-list .title-session{
-  font-size: 16px;
+  font-size: 14px;
   line-height: 1.2;
   margin-top: 5px;
+  min-height: 32px;
 }
 #session-list .session-col:nth-child(4n+1) {
     clear: left;
@@ -5023,6 +5038,7 @@ div#chat-remote-video video {
   padding: 0;
   border: 1px solid #dddddd;
   margin-bottom: 20px;
+  border-radius: 5px;
 }
 #session-list .item img{
   max-width: 100%;
@@ -5034,6 +5050,7 @@ div#chat-remote-video video {
 
 #session-list .information-item{
   padding: 10px;
+  min-height: 185px;
 }
 #session-list .information-item .requirements .fa-book{
   margin-right: 10px;
@@ -5388,7 +5405,7 @@ div#chat-remote-video video {
   border-radius: 5px;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
-  min-height: 350px;
+  min-height: 320px;
   margin-bottom: 10px;
 }
 .items-course .items-course-info .title{
@@ -5417,6 +5434,13 @@ div#chat-remote-video video {
   border-radius: 5px;
 
 }
+.items-course .items-course-info .toolbar{
+    text-align: center;
+    padding-top: 5px;
+}
+.items-course .items-course-info .vote_label_info{
+    margin-bottom: 5px;
+}
 .hot-course-head{
   padding-top: 10px;
   padding-bottom: 10px;
@@ -5800,7 +5824,14 @@ a.sessionView {
     border-radius: 25px;
     border-color: #00677C;
 }
-
+.modal-body .sectiontitle{
+    font-size: 18px;
+    padding-bottom: 10px;
+    color: #00829C;
+}
+.modal-body .sectioncomment{
+    color: #666;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {

documentation/changelog.html

@@ -48,15 +48,16 @@ <h1>Chamilo&nbsp;Changelog</h1>
 
 <a  name="1.10.0"></a>
 
-<h1>Chamilo 1.10.0 - San Juan, ? of October 2015</h1>
+<h1>Chamilo 1.10.0 - San Juan, 15th of October 2015</h1>
 <h3>Release notes - summary</h3>
 <p>Chamilo 1.10.0 is a major version of the 1.10.x branch, with new features and bugfixes on top of 1.9.10. As a major version, it requires the use of the upgrade script in order to upgrade an existing Chamilo portal. See install instructions</p>
 <h3>Release name</h3>
 <p>San Juan (or the "Old San Juan") was the main (old) harbour of Puerto Rico island. A frequent stop-over harbour for Europe's immigrants to the "new world" (be it Latin America or North America). Chamilo 1.10.0 marks a very strong intermediate step between the "old" Chamilo, inheriting over 14 years of code and experiences, and the "new" Chamilo, still maintaining its history of user experiences, but reworking the building bricks in a way that will make new developments possible faster, so that Chamilo can spread to the rest of the world in a rapid but stable way. Chamilo 1.10.0 integrates several new techniques of development that should improve is reliability, speed and flexibility. Welcome to the New World of learning, welcome to Chamilo 1.10.0! (so to speak)</p>
 <h3>Security fixes</h3>
   <ul>
     <li>There were no specific security flaws detected during the development of 1.10.0 but standard development procedures and criterias were followed during the development to ensure a very high security level.</li>
-  </ul>
+  <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1307b662d2b5ba011b98518caa91e6714d8e3367">1307b662</a> - <a href="https://task.beeznest.com/issues/10295">BT#10295</a>) Remove XSS when add/edit career</li>
+</ul>
 <h3>Possibly breaking changes</h3>
   <ul>
     <li>Dropped support for PHP 5.3 and inferior (now REQUIRES PHP 5.4 or more)</li>
@@ -70,7 +71,8 @@ <h3>Notable new Features</h3>
   Only showing some of the more than 3000 commits since 1.9.10 (https://github.com/chamilo/chamilo-lms/compare/v1.9.10...1.10.x). This section is divided into two for practical purposes: one fo normal users, one for developers and sysadmins.
   <h4>For end-users, teachers and Chamilo admins</h4>
   <ul>
-    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ab71b27233f6bbab8266fbc4be3ea96bf7512213">ab71b272</a>) Add clear documentation about dropping support for IE8 (only supporting IE9 and up + all other browsers) starting in 1.0.x</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d1aa7a96feef449f8e4811f674e35c107c306420">d1aa7a96</a> - <a href="https://support.chamilo.org/issues/279">#279</a>) Added new lib to vCard Exports</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ab71b27233f6bbab8266fbc4be3ea96bf7512213">ab71b272</a>) Add clear documentation about dropping support for IE8 (only supporting IE9 and up + all other browsers) starting in 1.0.x</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8e1e8a97fa266eba6d807fb129da318bbf7ff171">8e1e8a97</a> - <a href="https://task.beeznest.com/issues/9889">BT#9889</a>) You can now link a video to your course description</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/bd5519006ec43eec82b17cddc1f6475a73830d71">bd551900</a> - <a href="https://task.beeznest.com/issues/9889">BT#9889</a>) Add Session Description page to see more details about the session from the sessions catalogue</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/415c428aada4078ab4bd16a2f4adc38e65b2e690">415c428a</a> - <a href="https://task.beeznest.com/issues/9884">BT#9884</a>) Courses inside the session can now be ordered manually</li>
@@ -408,6 +410,42 @@ <h4>For developers and sysadmins</h4>
 
   <h3>Improvements (minor features) and debug</h3>
   <ul>
+
+
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/483f502ebee755dc5ed15e4ec144cc5725036b7b">483f502e</a> - <a href="https://support.chamilo.org/issues/7898">#7898</a>) WCAG AAA improvement onChange JS</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/3cb74208b95031de454ee074cc5f70303c87b303">3cb74208</a> - <a href="https://support.chamilo.org/issues/7883">#7883</a>) Slightly change skills list style on skill wheel's left panel</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/0182e1f28b3919de100423bf08bff5477f9277b9">0182e1f2</a> - <a href="https://support.chamilo.org/issues/7883">#7883</a>) Add badges to skills list + remove text from action buttons to increase space for description</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2030e4cff41211106809bf757d824fcb92733e21">2030e4cf</a> - <a href="https://support.chamilo.org/issues/7885">#7885</a>) Improve mail sent to teachers on student submission of assignment (remove visible path)</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/5052c4d38822b6b8b705015ecf57f348507618f1">5052c4d3</a> - <a href="https://support.chamilo.org/issues/7881">#7881</a>) Create page for badge criteria</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/73a64d311eeb05c45f41ec17dc5e20a67a04495a">73a64d31</a> - <a href="https://task.beeznest.com/issues/10363">BT#10363</a>)Add pdf export for gradebook results</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ae31808dada316d79ca78fec4fc01e9755c64aa9">ae31808d</a>) Make user picture clickable in whoisonline</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7db39d29e7ea87f89dc109b84fc62fb54ff94b7d">7db39d29</a>) Add title and OpenGraph tags to certificate default template</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f329f5d7204681eba80864c224d98f35cf3c224d">f329f5d7</a>) Fixes the fact that an Anonymous see global chat bar - Refs 7890</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2b95a8c296a0bf9d2552c775c7a71fec7b574b1a">2b95a8c2</a>) Add "I am a {language} user" and expose background context for tests</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ca149ba80fd5497b13a38dc6fff97d9eb912f009">ca149ba8</a> - <a href="https://support.chamilo.org/issues/7879">#7879</a>) Set course's allow_public_certificates depending of allow_public_certificates global</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8c734aa52a60cd57293194b57b2fec6ece922c39">8c734aa5</a> - <a href="https://support.chamilo.org/issues/7880">#7880</a>) Allow export badges when certificates aren't allowed</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1bbbea10ee88deffbde6fb32374bbdbe8efb1c7d">1bbbea10</a>) Fix the Issues with languages priorities</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/98250ce586b4d5f210ef619e06ee467c46a47ad2">98250ce5</a> - <a href="https://support.chamilo.org/issues/7875">#7875</a>) Plugin skype: clickable link</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8f67cf686f428278470e131fcd05df1257c4cbfd">8f67cf68</a> - <a href="https://support.chamilo.org/issues/7768">#7768</a>) Allow register beneficiaries with the sales of items</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/df5a2eb3ad28465b4fbf94263aa088b136f8dcff">df5a2eb3</a> - <a href="https://support.chamilo.org/issues/7768">#7768</a>) Register datetime of sales</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/5b26584ff2b2db0b5a33a5c642a431b80ecb2c5b">5b26584f</a> - <a href="https://support.chamilo.org/issues/7768">#7768</a>) Display payment method on sale report</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c44658d72906ec5ff1e6a957d52016958305729d">c44658d7</a> - <a href="https://support.chamilo.org/issues/7456">#7456</a>) Fix blank page when using hotpotatoe + LP</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/b91733cc167c69e09bfd49c63308e338fa8fa41d">b91733cc</a> - <a href="https://support.chamilo.org/issues/7835">#7835</a>) Avoid blocked icons by ad blockers</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2f18e077f9a552cc6f490c44a58ccf7c9fc0c2b0">2f18e077</a> - <a href="https://task.beeznest.com/issues/10280">BT#10280</a>) Format date in sessions categories list</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ed50ffd65266b047ad193a5b887ad11f44c8bfa5">ed50ffd6</a> - <a href="https://task.beeznest.com/issues/10311">BT#10311</a>) add jquery.timelinr and img BT#10311</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a20b8fc767010b5593a43d93df49d48afc406bb2">a20b8fc7</a> - <a href="https://task.beeznest.com/issues/10281">BT#10281</a>) Apply format to session dates on session list</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/588ad672ddb7da7ac7e39368b6f6c1a51bc1a3df">588ad672</a> - <a href="https://task.beeznest.com/issues/10283">BT#10283</a>) Allow filter session list by category</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/9837c8ad7e5de3289352ef95c9aa3f6d4a46b5bc">9837c8ad</a> - <a href="https://support.chamilo.org/issues/5208">#5208</a>) Add CKEditor to Agenda, This fixed a minor bug</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c2320a5094449e2ad7dc5f4554fc4cfd8f288574">c2320a50</a> - <a href="https://task.beeznest.com/issues/10269">BT#10269</a>) Improve password strength on registration form</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ff6f11858e8c332b0bce1949e7b704407e766ed5">ff6f1185</a>) Improve translation to French for tour plugin</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d31059d2cb7394b2db895db01880f603e9732ca6">d31059d2</a> - <a href="https://support.chamilo.org/issues/10308">#10308</a>) Show modal title when send messages</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/49d6dfed77bac5c215895c106f067177d507904e">49d6dfed</a>) Add small video conversion script. Might be useful for other things</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/431576b2b9bda713b5f29b85b553a6a6265d195f">431576b2</a> - <a href="https://support.chamilo.org/issues/6579">#6579</a>) Load favicon from CSS dir</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f2a03393774e8dd02f1d33acc69022f3cd6fb133">f2a03393</a> - <a href="https://support.chamilo.org/issues/7558">#7558</a>) Add method to get a HTML code for a icon by Font Awesome</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/6956617f5d41b43a26ad837ae6c1d604e92a3b2a">6956617f</a> - <a href="https://task.beeznest.com/issues/7680">BT#7680</a>) Download file directly</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/8371a3754f643658cd9e71e811bbd804bb560373">8371a375</a> - <a href="https://task.beeznest.com/issues/10217">BT#10217</a>) XFrameOptions work around</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/7a11b484f5f21401d051353de69c400ec346e75c">7a11b484</a> - <a href="https://task.beeznest.com/issues/10248">BT#10248</a>) Show session_admin on Resume Session page - BT#10248</li>
+    <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/4d2f0513909bf7777499ce6093a1269fd78987a9">4d2f0513</a> - <a href="https://support.chamilo.org/issues/7808">#7808</a>) Save asset time in learning paths</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/fccfb6b77df1a98fca296f8d9232ad043418ed87">fccfb6b7</a> - <a href="https://task.beeznest.com/issues/7683">BT#7683</a>) Add css frame.css in CkEditor</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/86e4df09c032771724b5bdec01c9f69b77375085">86e4df09</a> - <a href="https://task.beeznest.com/issues/7683">BT#7683</a>) Remove css frames theme Chamilo</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2622d7bc6caf12066853c83a9d0242b23cf543a8">2622d7bc</a> - <a href="https://task.beeznest.com/issues/7683">BT#7683</a>) Fix scorm lesson appearance</li>
@@ -962,7 +1000,7 @@ <h3>Removals</h3>
   <li>main/reservation code was removed</li>
   <li>main/metadata code was removed</li>
   <li>Tables "userinfo_def" and "userinfo_def_content" were removed as well as the code.</li>
-  <li>Dropped support for IE8</li>
+  <li>Dropped support for IE8 and inferior</li>
   <li>Dropped support for PHP 5.3 and inferior</li>
 </ul>
 <h3>Known issues</h3>

documentation/credits.html

@@ -42,7 +42,7 @@
 <h1>Chamilo Credits</h1>
 <h2>Table of contents</h2>
 <ul>
-  <li><a href="#core-developers">Core developers</a></li>
+  <li><a href="#core-developers">Core contributors</a></li>
   <li><a href="#quality-assurance">Quality assurance</a></li>
   <li><a href="#performance">System performance</a></li>
   <li><a href="#tools">Tools</a></li>
@@ -69,10 +69,13 @@ <h2>Chamilo LMS 1.9.*</h2>
 <ul>
   <li>Yannick Warnier (yannick.warnier@beeznest.com) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>
   <li>Julio Montoya (gugli100@gmail.com) - Lead developer - BeezNest, France</li>
-  <li>Hubert Borderiou - Developer responsible for exercises categories and many other practical fixes - Université de Grenoble, France</li>
+  <li>Angel Quiroz (<a href="https://github.com/AngelFQC">https://github.com/AngelFQC</a>) - Developer - BeezNest, Peru</li>
+  <li>Alex Aragon (<a href="https://github.com/aragonc/">https://github.com/aragonc/</a>) - Designer - BeezNest, Peru</li>
   <li>Michela Mosquera - Community manager for the (very large) Latin American community - BeezNest, Peru</li>
-  <li>Coursenligne45 - Anonymous reporter and contributor to many bugfixes - Independent, France</li>
   <li>Noa Orizales - Tireless coordinator of everything non-related to coding, which enabled developers to do a better job - Contidos Dixitais, Spain</li>
+  <li>Laura Guirao, José & José Angel from Nosolored - Technical assistance and contributions to testing and forum community</li>
+  <li>Hubert Borderiou - Developer responsible for exercises categories and many other practical fixes - Université de Grenoble, France</li>
+  <li>Coursenligne45 - Anonymous reporter and contributor to many bugfixes - Independent, France</li>
   <li>Yoselyn Castillo (yoselyn.castillo@beeznest.com) - Maintainer developer - BeezNest, Cuba</li>
   <li>Marko Kastelic - Reporter and contributor to many bugfixes - Independent, Slovenia</li>
   <li>Juan Carlos Raña Trabado - Independent developer and mastermind for documents, wiki and other pedagogical tools - Independent, Spain</li>
@@ -531,6 +534,7 @@ <h2>HTML Editor</h2>
       <li>Furio Petrossi for advocacy, research and recommendations  </li>
     </ul>
   </li>
+  <li>Upgrade to CKeditor 4 in Chamilo 1.10.0</li>
 </ul>
 <h2>Drawing tool</h2>
 <ul>
@@ -570,6 +574,7 @@ <h1>Documentation</h1>
   <li>Anaël Boulier</li>
   <li>Laura Guirao</li>
   <li>José Garcia</li>
+  <li>Noa Orizales</li>
   <li>Jerome Warnier</li>
   <li>Arnaud Ligot</li>
   <li>Andrew Lynn (alynn@strathclyde.ac.be)</li>
@@ -722,7 +727,8 @@ <h1>Contributing organizations (only recorded since 2010)</h1>
   <li>ICPNA, Peru</li>
   <li>Imag'in, Nouméa, New Caledony</li>
   <li>IPYS, Lima, Peru</li>
-  <li>Ministerio de Educación, Peru</li>
+  <li>Ministerio de Educación (UCG), Peru (with financial support from Canada through GRADE - http://www.grade.org.pe/)</li>
+  <li>Ministerio de Salud, Peru (with financial support from the Belgian Cooperation - http://btcctb.org)</li>
   <li>NoSoloRed, Spain</li>
   <li>Ricoh, Panama</li>
   <li>Rimac Seguros, Peru</li>
@@ -745,6 +751,7 @@ <h1>Deprecated developments</h1>
   <li>HTMLarea (WYSIWYG html editor): now removed and replaced by FCKeditor</li>
   <li>Table of contents: now removed, replaced by learning path</li>
   <li>Facultad de Matematicas, UADY (México) (original asynchronous Message plugin, was later dumped)</li>
+  <li>Reservations tool</li>
 </ul>
 <br />
 <a name="association"></a>

documentation/index.html

@@ -39,9 +39,9 @@ <h1>Chamilo 1.10 - Documentation</h1>
             <br />
 
             <a class="btn btn-primary btn-large" href="installation_guide.html">English installation guide</a>
-            <a class="btn btn-primary btn-large"  href="installation_guide_es_ES.html">Spanish installation guide</a>
-            <a class="btn btn-primary btn-large" href="installation_guide_fr_FR.html">French installation guide</a>
-            <a class="btn btn-primary btn-large"  href="installation_guide_it_IT.html">Italian installation guide</a>
+            <a class="btn btn-primary btn-large"  href="installation_guide_es_ES.html">Spanish installation guide (outdated)</a>
+            <a class="btn btn-primary btn-large" href="installation_guide_fr_FR.html">French installation guide (outdated)</a>
+            <a class="btn btn-primary btn-large"  href="installation_guide_it_IT.html">Italian installation guide (outdated)</a>
             <a class="btn btn-large"  href="http://www.chamilo.org/forum">Chamilo Forum</a>
             <br />
             <br />