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

Author: ywarnier

app/Resources/public/css/base.css

@@ -1425,107 +1425,6 @@ a.unread {
     text-align:right;
 }
 
-#group_description {
-    margin: 10px 0px 10px 0px;
-}
-
-#group_privacy {
-    margin: 10px 0px 10px 0px;
-}
-
-#group_permissions {
-    -moz-background-clip:border;
-    -moz-background-inline-policy:continuous;
-    -moz-background-origin:padding;
-    -moz-border-radius-bottomleft:8px;
-    -moz-border-radius-bottomright:8px;
-    -moz-border-radius-topleft:8px;
-    -moz-border-radius-topright:8px;
-    background:#EEE none repeat scroll 0 0;
-    margin: 20px 0px 20px 0px;
-}
-
-#group_permissions ul {
-    list-style-image:none;
-    list-style-position:outside;
-    list-style-type:none;
-    margin:0;
-    padding:0;
-}
-
-#group_permissions ul li {
-    margin: 10px 0px 10px 5px;
-}
-
-/* Groups boxes */
-
-.groups_grid_container {
-    width:100%;
-}
-.groups_grid_item {
-    width:80px;
-    float:left;
-    margin:5px;
-}
-.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;}
-.groups_grid_element_1 { width:100px; float:left; text-align:left;  margin-bottom:5px;}
-.groups_grid_element_2 { width:150px; float:left;}
-
-/*MY GROUPS*/
-
-.mygroups_grid_item {
-    border-bottom:1px solid #EAEAEA;
-    float: left;
-    height: 70px;
-    margin: 0 8px 15px 15px;
-    padding: 16px 12px 40px 0px;
-    width:600px;
-}
-
-.topic_div {
-    width:620px;
-    border-bottom:1px solid #EAEAEA;
-    margin-bottom: 20px;
-    height: 96px;
-}
-
-.box_description_group_member {
-    color: #999999;
-    font-size: 10px;
-}
-
-.mygroups_grid_element_1 {
-    width:600px;
-    height:100px;
-    overflow:hidden;
-}
-
-.box_description_group_title h2 {
-    margin-bottom:4px;
-    margin-top: 0px;
-}
-
-.box_description_group_title {
-    float:right;
-    width:530px;
-}
-.box_description_group_content {
-    float:right;
-    width:530px;
-    margin-top:5px;
-    /* height:45px;*/
-    font-family:Verdana, Geneva, sans-serif;
-    font-size:12px;
-    color:#666666;
-}
-.box_description_group_actions {
-    float:right;
-    width:530px;
-    text-align:right;
-    margin-top:4px;
-    margin-right:4px;
-}
-
 /* Big icons course home page styles */
 #course_tools .big_icon {
     padding:10px;
@@ -3305,27 +3204,6 @@ a.forum_group_link {
     margin-bottom:5px;
 }
 
-/* User list */
-
-.blackboard_show {
-    float:left;
-    position:absolute;
-    border:1px solid black;
-    width: 200px;
-    background-color:white;
-    z-index:99; padding: 3px;
-    display: inline;
-}
-.blackboard_hide {
-    display: none;
-}
-
-#online_grid_container {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-
 #hide_bar_template {
     vertical-align: middle;
     width: 10px;
@@ -4107,42 +3985,46 @@ i.size-32.icon-new-work{
 #skillList .dropdown-menu{
   top: 30px;
 }
-.social-group .list-group-newest .items{
+#sm-groups .list-group-newest .items{
   display: block;
 }
-.social-group .list-group-newest .items .group-image{
+#sm-groups .list-group-newest .items .group-image{
   vertical-align: top;
   padding-left: 10px;
   padding-right: 10px;
 }
-.social-group .list-group-newest .items .group-image,
-.social-group .list-group-newest .items .group-info
+#sm-groups .list-group-newest .items .group-image,
+#sm-groups .list-group-newest .items .group-info
 {
   display: inline-block;
 }
-.social-group .list-group-newest .items .group-info{
+#sm-groups .list-group-newest .items .group-info{
   width: auto;
 }
-.social-group .items{
+#sm-groups .items{
   border-bottom: 1px dotted #B1DDE0;
   padding-bottom: 5px;
   margin-bottom: 5px;
 }
-.social-group .group-name a{
+#sm-groups .group-name a{
   font-size: 14px;
   font-weight: bold;
   color: #4D4D4D;
 }
-.social-group .count-username{
+#sm-groups .count-username{
   font-size: 12px;
   color: #4D4D4D;
 }
-.social-group .description p{
+#sm-groups .description p{
   color: #4D4D4D;
   padding-top: 10px;
   padding-bottom: 0px;
   font-size: 11px;
 }
+.sm-groups .social-profile .img-responsive{
+  display: inline-block;
+  width: 100px;
+}
 .social-post .mediaPost{
   padding-top:10px;
   padding-bottom: 5px;
@@ -5484,13 +5366,19 @@ div#chat-remote-video video {
   box-shadow: 0 2px 3px #C8C8C8;
   border: 1px solid #e6e6e6;
   margin-bottom: 20px;
-  min-height: 240px;
+  min-height: 230px;
+}
+#whoisonline .items-user-avatar .img-responsive{
+    display: inline-block;
 }
 #whoisonline .items-user-name{
   font-size: 12px;
   padding-top: 10px;
   line-height: 15px;
 }
+#whoisonline .items-user .toolbar .btn, #whoisonline .items-user .items-user-status{
+  margin-bottom: 5px;
+}
 .search-user label{
   font-weight: normal;
   padding-left: 10px;

documentation/changelog.html

@@ -48,7 +48,7 @@ <h1>Chamilo&nbsp;Changelog</h1>
 
 <a  name="1.10.0"></a>
 
-<h1>Chamilo 1.10.0 - San Juan, 15th of October 2015</h1>
+<h1>Chamilo 1.10.0 - San Juan, 16th 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>
@@ -66,6 +66,7 @@ <h3>Possibly breaking changes</h3>
     <li>A few languages now get a "parent" language which is not English. In this case, we have based the update query on an ID that we "assume" to be the right one for Spanish, Italian, French, Chinese and Portuguese. If the ID is not correct, you might, in the worst case scenario, get Chinese or Arabic terms appear in a language that is not the primary one, like Galician (normally taking Spanish as parent language). This can be fixed very easily by an "UPDATE language SET parent_id = NULL"; for all your languages, and then re-apply the parent manually to your sub-language if it needs one.</li>
     <li>"Character set" platform setting can't be modified. It is now fixed to UTF-8 (see #7652). This comes as a decision given the fact that other character encoding types were only there for backwards compatibility reasons, and that the last version with something else than UTF-8 was released more than 5 years ago.</li>
     <li>Starting from 1.10.0, courses directories will really be deleted when the course is deleted. No more logical-delete-but-no-physical-delete policy where the folder used to remain available for last-minute recovery of resources. You are trusted to take backups when necessary to avoid inconvenient situations. This comes as a decision considering the increasing number of huge installations where ghost course directories become a considerable space issue very quickly, and as an observation that, in fact, this feature is very little known and very few people use it to actually recover deleted course material.</li>
+    <li>The hotspot question type is broken due to changes in the underlying Chamilo code. Given the fact this question type is developed in Flash and none of the developers at the time of release had Adobe CS available (proprietary technology that requires compilation) we have been unable to update the corresponding Flash code. Work is under way to provide the same feature using only HTML5, but it is likely to appear in a corrective version for 1.10.0. If you have an urgent need for this feature, please contact an official provider to get this sorted: [email protected]</li>
   </ul>
 <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.
@@ -406,12 +407,19 @@ <h4>For developers and sysadmins</h4>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/4c0780aa76778c390ace24f6cf85a100fc6459ba">4c0780aa</a> - <a href="https://task.beeznest.com/issues/9897">BT#9897</a>) Add new reset password option</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/67b0693c31b338c18ee0a8aa5868c411c81a5c66">67b0693c</a> - <a href="https://task.beeznest.com/issues/10092">BT#10092</a>) Create TrackECourseAccessRepository entity</li>
     <li>(<a href="https://github.com/chamilo/chamilo-lms/commit/fcc9030fafb047c4a62eb671a6213671797edabd">fcc9030f</a> - <a href="https://task.beeznest.com/issues/9881">BT#9881</a>) Add fields to associate forum to lp</li>
+    <li>The hotspot question type is broken due to changes in the underlying Chamilo code. Given the fact this question type is developed in Flash and none of the developers at the time of release had Adobe CS available (proprietary technology that requires compilation) we have been unable to update the corresponding Flash code. Work is under way to provide the same feature using only HTML5, but it is likely to appear in a corrective version for 1.10.0. If you have an urgent need for this feature, please contact an official provider to get this sorted: [email protected]</li>
   </ul>
 
   <h3>Improvements (minor features) and debug</h3>
   <ul>
-
-
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/382bb40e70502a270e3fdbc158c1b23da37d8340">382bb40e</a> - <a href="https://support.chamilo.org/issues/7905">#7905</a>) Fix personal, course, group and session events visibilities for all user roles</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/441d7828be2ef9409a7d7302a12b7cac2c1788bb">441d7828</a>) Fix permissions and cidReset detector to avoid preventing a course tutor to enter his own session-course</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d3a910d40c5de4adbfdabdaa07a2c137e865a5cd">d3a910d4</a> - <a href="https://support.chamilo.org/issues/7883">#7883</a>) Improve check to select on skill wheel</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a4e168bb0919beaaffd64c464186c597cead0ed2">a4e168bb</a>) Fix issue with date type selector not being set to the correct default in thematic advance</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/b18014ff31305072e5a5e25843f77ec6bb21318f">b18014ff</a>) Fix missing cid in gradebook links</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/200ba3d30f9120e978479c8b3e48e6d4b27f7a42">200ba3d3</a>) Fixing show the Save icon on exercise submit</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/b9ebb0af6d79bd3882df0a7513844f5d27939e56">b9ebb0af</a>) Fix missing links tool action icons titles</li>
+<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d55a9e278203d6306deae108755a6a0825fc6f80">d55a9e27</a>) Don't show Hot Spot Delineation question type when Scenario is disabled</li>
 <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>

documentation/installation_guide.html

@@ -36,7 +36,7 @@
 </nav>
 
 <div class="container">
-<h1>Chamilo - Installation Guide</h1>
+<h1>Chamilo 1.10 - Installation Guide</h1>
 
 <p>Thank you for downloading Chamilo</p>
 <ul>
@@ -164,8 +164,8 @@ <h2><a name="2._Installation_of_Chamilo_LMS"></a><span style="font-weight: bold;
     <li>[chamilo]/web/</li>
     <li>[chamilo]/main/default_course_document/images/</li>
 </ul>
-Optionally, you can do the same to the following directories if you want to
-enable CSS styles package upload and sub-language definition:
+Optionally, you can do the same to the following directory if you want to
+enable sub-languages definition:
 <ul>
   <li>[chamilo]/main/lang/</li>
 </ul>
@@ -218,7 +218,7 @@ <h3>PHP configuration</h3>
 <div class="code">
       max_execution_time = 300 ;Maximum execution time of each script, in seconds<br />
       max_input_time = 600 ;Maximum amount of time each script may spend parsing request data<br />
-      memory_limit = 128M ;Maximum amount of memory a script may consume (128MB)<br />
+      memory_limit = 256M ;Maximum amount of memory a script may consume (128MB)<br />
       post_max_size = 100M<br />
       upload_max_filesize = 100M;<br />
       short_open_tag       = Off<br />
@@ -310,8 +310,8 @@ <h3>3.1 Upgrading from Chamilo 1.10.x (minor upgrade)</h3>
     older version's directory). Note that you should remove the "home" and
     "searchdb" directories from the package before you overwrite the previous
     files.</li>
-  <li> edit the main/inc/conf/configuration.php file: at the en of the file, locate the previous version number (e.g. '1.10.4') and change it to this new version (e.g. '1.10.8')</li>
-  <li> clean your archive/ directory: take a temporary copy of index.html, delete all the contents *in* this directory (do NOT remove the directory itself, only its contents!). It will all be re-generated. You can also delete the contents of this directory through the "Archive directory cleanup" option in the "System" box of the Administration page.</li>
+  <li> edit the app/config/configuration.php file: at the en of the file, locate the previous version number (e.g. '1.10.4') and change it to this new version (e.g. '1.10.8')</li>
+  <li> clean your app/cache/twig directory: delete all the contents *in* this directory (do NOT remove the directory itself, only its contents!). It will all be re-generated. You can also delete the contents of this directory through the "Archive directory cleanup" option in the "System" box of the Administration page.</li>
   <li> you're done! No other upgrade procedure is required</li>
 </ul>
 
@@ -324,7 +324,7 @@ <h3>3.2 Upgrading from Chamilo 1.9.x</h3>
   <li> download the Chamilo 1.10 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
   <li> unzip the new files of Chamilo 1.10 over the files of the older version (or unzip the files in one folder and then copy the files from there to the older version's directory)</li>
   <li> make *absolutely sure* that the .htaccess file of version 1.10 is copied as well</li>
-  <li> make sure "AllowOverride All" is present in your Apache configuration, as interpreting the .htaccess files is very important for Chamilo to work (note that Order-Allow directives have been replaced by "Require all granted" in Apache 2.4)</li>
+  <li> make sure "AllowOverride All" is present in your Apache configuration, as interpreting the .htaccess files is very important for Chamilo to work (note that the Order-Allow directive has been replaced by "Require all granted" in Apache 2.4)</li>
   <li> point your browser on your portal URL + main/install/</li>
   <li> click&nbsp;<span style="font-style: italic;">Install</span>, then choose <span style="font-style: italic;">Upgrade from 1.9.*</span></li>
 </ul>