diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:48:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:57:08 +0200 |
| commit | efbc02acf30e1a98db9b7123610c593fe8fa6832 (patch) | |
| tree | b37f3b040ad69ea8848235dbb8f84c34e90c24b9 | |
| parent | f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978 (diff) | |
| parent | 49a53755e6da8a8dc5ff09ba1768c9069a00ef52 (diff) | |
| download | forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.gz forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.bz2 forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.tar.xz forums-efbc02acf30e1a98db9b7123610c593fe8fa6832.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
Conflicts:
phpBB/install/database_update.php
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 9 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 1b8d42a660..4a3799d143 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.0.11-RC1" /> + <property name="newversion" value="3.0.11-RC2" /> <property name="prevversion" value="3.0.10" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.11-RC1" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0c56dbb2a3..942912a593 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -151,6 +151,14 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10890">PHPBB3-10890</a>] - test_sql_fetchrow_returns_false_when_empty() fails on MSSQL and Oracle</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10908">PHPBB3-10908</a>] - No remote avatar size limit results in files limited only by PHP memory limit</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10913">PHPBB3-10913</a>] - Admin is logged out when accessing any url under adm/ without session id</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10441">PHPBB3-10441</a>] - Update to docs/README.html</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10773">PHPBB3-10773</a>] - ACP phpBB logo needs registered trademark symbol</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10935">PHPBB3-10935</a>] - Limit number of PM rules per user</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10937">PHPBB3-10937</a>] - Comment removal functions: Backward compatibility broken</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10950">PHPBB3-10950</a>] - Deleting user with undelivered PMs causes SQL error</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10952">PHPBB3-10952</a>] - includes/constants.php version number incorrect</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10965">PHPBB3-10965</a>] - Dropdown CPF now shows in profile when no value is selected</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10978">PHPBB3-10978</a>] - Typo in prosilvers ucp_groups_membership.html</li> </ul> <h4>Improvement</h4> <ul> @@ -181,6 +189,7 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10891">PHPBB3-10891</a>] - Allow specifying test config file name via environment variable</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10892">PHPBB3-10892</a>] - Cosmetic improvements to RUNNING_TESTS.txt</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10898">PHPBB3-10898</a>] - Do not write ?> into config.php to avoid whitespace output</li> +<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10925">PHPBB3-10925</a>] - Clarify that SQLite3 is not supported for phpBB 3.0.x</li> </ul> <h4>New Feature</h4> <ul> diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index f91bd76784..5f5cf41aac 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2218,6 +2218,10 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + // No changes from 3.0.11-RC1 to 3.0.11-RC2 + case '3.0.11-RC1': + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': |