mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.0.9' into develop-olympus

Browse Source 
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
This commit is contained in:
Andreas Fischer
2011-07-07 20:29:14 +02:00
parent 71df03960c 1fa77c2fd5
commit f2110183e0
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.xml
View File

@@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="3.0.9" /> <property name="newversion" value="3.0.9-RC4" />
<property name="prevversion" value="3.0.8" /> <property name="prevversion" value="3.0.8" />
<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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" /> <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.9-RC1, 3.0.9-RC2, 3.0.9-RC3" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->

2
phpBB/docs/CHANGELOG.html
View File

@@ -335,6 +335,8 @@
</li> </li>
<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] - mediumint(8) too small for phpbb_login_attempts.attempt_id <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] - mediumint(8) too small for phpbb_login_attempts.attempt_id
</li> </li>
<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10250'>PHPBB3-10250</a>] - phpBB Logo needs the Registered Trademark Symbol
</li>
</ul> </ul>
<h4> Improvement <h4> Improvement

4
phpBB/install/database_update.php
View File

@@ -979,7 +979,7 @@ function database_update_info()
'3.0.9-RC1' => array(), '3.0.9-RC1' => array(),
// No changes from 3.0.9-RC2 to 3.0.9-RC3 // No changes from 3.0.9-RC2 to 3.0.9-RC3
'3.0.9-RC2' => array(), '3.0.9-RC2' => array(),
// No changes from 3.0.9-RC3 to 3.0.9 // No changes from 3.0.9-RC3 to 3.0.9-RC4
'3.0.9-RC3' => array(), '3.0.9-RC3' => array(),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */
@@ -1983,7 +1983,7 @@ function change_database_data(&$no_updates, $version)
case '3.0.9-RC2': case '3.0.9-RC2':
break; break;
// No changes from 3.0.9-RC3 to 3.0.9 // No changes from 3.0.9-RC3 to 3.0.9-RC4
case '3.0.9-RC3': case '3.0.9-RC3':
break; break;
} }