chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Solve 1.10 merge conflict - refs BT#9068

Browse Source
1.10.x
Imanol Losada 10 years ago
parent 8e1e8c9030 d514652139
commit 2a1fef2ba9
6 changed files with 54 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      documentation/changelog.html
  2. 5
      documentation/credits.html
  3. 2
      documentation/index.html
  4. 42
      documentation/installation_guide.html
  5. 11
      main/install/index.php
  6. 8
      main/install/version.php

13
documentation/changelog.html
Unescape View File

@ -44,6 +44,19 @@
<p><i>Note: most #wxyz references are issue numbers you can find in <a href="http://support.chamilo.org/projects/chamilo-18/issues" target="_blank">our public bug tracking system</a>. Some references marked BT#xyz are developments made externally for BeezNest customers and integrated into Chamilo. The details of these tasks cannot be seen for confidentiality reasons, but the code change is public and can be reviewed by anyone.</i></p>
<p>&nbsp;</p>
<h1>Chamilo 1.10.0 - ???, ??? 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>
<h3>Security fixes</h3>
<h3>Possibly breaking changes</h3>
<h3>Notable new Features</h3>
<h3>Improvements (minor features) and debug</h3>
<h3>Stylesheets and theming</h3>
<h3>Web services</h3>
<h3>Removals</h3>
<h1>Chamilo 1.9.10 - Huánuco, 25th of January, 2015</h1>
<h3>Release notes - summary</h3>
<p>Chamilo 1.9.10 is a new minor version of the 1.9.x branch, with many bugfixes and a few interesting new features (as such, you can just overwrite previous files to upgrade from 1.9.8, 1.9.8.1 or 1.9.8.2 to 1.9.10).</p>

5
documentation/credits.html
Unescape View File

@ -58,6 +58,11 @@ In the following credits, when possible, we tried to put the latest contributors
<a name="core-developers"></a>
<h1>Core contributors / Core team</h1>
<p>The core contributors are the people who contributed most to the Chamilo software. We are eternally thankful to them for having demonstrated a very high level of commitment, contributing their time and ideas to the project. Since version 1.9, we also include non-developer contributors as we consider their help is essential to the success of our project. This list is updated with each version.</p>
<h2>Chamilo LMS 1.10.*</h2>
<ul>
<li>Yannick Warnier (yannick.warnier@beeznest.com) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>
<li>Julio Allen Montoya Armas (gugli100@gmail.com) - Lead developer - BeezNest, France</li>
</ul>
<h2>Chamilo LMS 1.9.*</h2>
<ul>
<li>Yannick Warnier (yannick.warnier@beeznest.com) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>

2
documentation/index.html
Unescape View File

@ -33,7 +33,7 @@
<div class="container">
<div class="row">
<div class="hero-unit">
<h1>Chamilo 1.9 - Documentation</h1>
<h1>Chamilo 1.10 - Documentation</h1>
<br />
<a class="btn btn-primary btn-large" href="installation_guide.html">English installation guide</a>

42
documentation/installation_guide.html
Unescape View File

@ -326,7 +326,7 @@ previous version of Chamilo LMS (1.*) or Dok€os (&lt;2.0)</h2>
Before upgrading, we <b>heavily</b> recommend you do a full backup of the previous
Chamilo or Dok€os directories and databases. If you are unsure how to achieve this
please ask your hosting provider for advice.<br />
<em>Chamilo LMS 1.9 comes with a new database structure in comparison to 1.8.
<em>Chamilo LMS 1.10 comes with a new database structure in comparison to 1.9, and so between 1.9 and 1.8.
Although the upgrade script takes the migration in charge, it might be generating
a very heavy load on your server during the upgrade, and will change your
database completely, preserving the data as well as possible (we have tested
@ -346,30 +346,30 @@ please contact one of the Chamilo Association's official providers &lt;providers
<p></p>
<h3>3.1 Upgrading from Chamilo 1.9.x (minor upgrade)</h3>
As this is only a minor version change from previous 1.9.* versions of Chamilo, the only thing you need to do is:
<h3>3.1 Upgrading from Chamilo 1.10.x (minor upgrade)</h3>
As this is only a minor version change from previous 1.10.* versions of Chamilo, the only thing you need to do is:
<ul>
<li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
<li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
<li> unzip the new files of Chamilo 1.9 over the files of the older version
<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). 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.9.4') and change it to this new version (e.g. '1.9.8')</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> you're done! No other upgrade procedure is required</li>
</ul>
<br />
<h3>3.2 Upgrading from Chamilo 1.8.x</h3>
<h3>3.2 Upgrading from Chamilo 1.8.x or 1.9.x</h3>
<ul>
<li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
<li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
<li> unzip the new files of Chamilo 1.9 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> 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> point your browser on your portal URL + main/install/</li>
<li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x</span></li>
<li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x/1.9.x</span></li>
</ul>
<br />
@ -379,10 +379,10 @@ As this is only a minor version change from previous 1.9.* versions of Chamilo,
<em>If you upgrade from Dok€os 1.8.x</em> :&nbsp;
<ul>
<li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
<li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
<li> unzip the new files of Chamilo 1.9 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> 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> point your browser on your portal URL + main/install/</li>
<li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x</span></li>
<li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x/1.9.x</span></li>
</ul>
A bunch of Chamilo administrators have reported minor issues with the migration between versions considerably apart (like from Dok€os to Chamilo).
This might include loosing some assignments or forum posts. To avoid any ugly effect on your users, we recommend you first establish a checklist
@ -425,9 +425,9 @@ The complete process is as follow:
<em>old_version</em> and make it writeable by the web server. This
is important to allow the move of the courses/ and upload/ directories
to the new install</li>
<li> download the Chamilo 1.9 install package from the
<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.9 in the main Chamilo/Dok€os directory. The
<li> unzip the new files of Chamilo 1.10 in the main Chamilo/Dok€os directory. The
new directory <em>main</em> should be located directly inside your
Chamilo/Dok€os root folder</li>
<li> point your browser on your portal URL</li>
@ -477,7 +477,7 @@ On Linux, Mac OS X and BSD operating systems you can quick-fix this using the
your own OS on <a href="http://www.chamilo.org/forum">our forum</a>.
In Windows, you may need to check the properties of the folders.
<p></p>
<h3>3.6 Quick-upgrade from 1.8.x guide for Linux</h3>
<h3>3.6 Quick-upgrade from 1.9.x guide for Linux</h3>
The following quick-upgrade guide assumes that:
@ -498,11 +498,11 @@ On the command-line, type:
<li>mkdir /var/www/chamilo/old_version</li>
<li>mv /var/www/chamilo/* /var/www/chamilo/old_version/</li>
<li>chmod -R 0777 /var/www/chamilo/old_version/</li>
<li>wget http://chamilo.googlecode.com/files/chamilo-1.9.10.tar.gz</li>
<li>tar zxvf chamilo-1.9.10.tar.gz</li>
<li>sudo cp -ra chamilo-1.9.10/* /var/www/chamilo/</li>
<li>rm chamilo-1.9.10.tar.gz</li>
<li>sudo rm -r chamilo-1.9.10/</li>
<li>wget https://github.com/chamilo/chamilo-lms/archive/v1.9.10.tar.gz</li>
<li>tar zxvf chamilo-lms-1.9.10.tar.gz</li>
<li>sudo cp -ra chamilo-lms-1.9.10/* /var/www/chamilo/</li>
<li>rm chamilo-lms-1.9.10.tar.gz</li>
<li>sudo rm -r chamilo-lms-1.9.10/</li>
</ul>
<br />

11
main/install/index.php
Unescape View File

@ -111,7 +111,7 @@ error_reporting(E_ALL);
// Upgrading from any subversion of 1.6 is just like upgrading from 1.6.5
$update_from_version_6 = array('1.6', '1.6.1', '1.6.2', '1.6.3', '1.6.4', '1.6.5');
// Upgrading from any subversion of 1.8 avoids the additional step of upgrading from 1.6
$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2','1.9.4','1.9.6', '1.9.6.1');
$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0', '1.9.2','1.9.4','1.9.6', '1.9.6.1', '1.9.8', '1.9.8.1', '1.9.8.2', '1.9.10');
$my_old_version = '';
$tmp_version = get_config_param('dokeos_version');
@ -861,6 +861,15 @@ if (@$_POST['step2']) {
case '1.9.4':
case '1.9.6':
case '1.9.6.1':
case '1.9.8':
case '1.9.8.1':
case '1.9.8.2':
case '1.9.10':
include 'update-db-1.9.0-1.10.0.inc.php';
//include 'update-files-1.9.0-1.10.0.inc.php';
//Only updates the configuration.inc.php with the new version
include 'update-configuration.inc.php';
break;
default:
break;
}

8
main/install/version.php
Unescape View File

@ -12,10 +12,10 @@
/**
* Variables used from the main/install/index.php
*/
$new_version = '1.9.10';
$new_version_status = 'stable';
$new_version = '1.10.0';
$new_version_status = 'alpha';
$new_version_last_id = 0;
$new_version_stable = true;
$new_version_major = false;
$new_version_stable = false;
$new_version_major = true;
$software_name = 'Chamilo';
$software_url = 'http://www.chamilo.org/';

Write Preview
Loading…
Cancel
Save