diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:12:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:12:56 +0100 |
| commit | bacb38b1615b6d65f4d5494ff243783a46365a4e (patch) | |
| tree | 4c5bbc04ffe96c3d7a56525b03a665634593e495 | |
| parent | c14cf0457dedfd0c1a8a72dc0571e60ccb8b03f6 (diff) | |
| parent | 3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (diff) | |
| download | forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.gz forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.bz2 forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.xz forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 15 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v313rc2.php | 32 |
3 files changed, 48 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 17a04d1072..b799af1a99 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,7 +3,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.2.0-a1-dev" /> - <property name="prevversion" value="3.1.3-RC1" /> + <property name="prevversion" value="3.1.3-RC2" /> <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" /> <!-- no configuration should be needed beyond this point --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a7b47ab0f0..acf5a318be 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@ <ol> <li><a href="#changelog">Changelog</a> <ul> + <li><a href="#v312">Changes since 3.1.3-RC1</a></li> <li><a href="#v312">Changes since 3.1.2</a></li> <li><a href="#v311">Changes since 3.1.1</a></li> <li><a href="#v310">Changes since 3.1.0</a></li> @@ -105,6 +106,20 @@ <div class="content"> + <a name="v313rc1"></a><h3>Changes since 3.1.3-RC1</h3> + + <h4>Bug</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12933">PHPBB3-12933</a>] - The search operator for partial matches does not work</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13544">PHPBB3-13544</a>] - Migrations' "permission.permission_unset" deletes all permissions instead of just the one stated</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13556">PHPBB3-13556</a>] - Translated exceptions from file_downloader are handled incorrectly</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13557">PHPBB3-13557</a>] - Migrations for 3.0.13 and PL1 are missing</li> + </ul> + <h4>Task</h4> + <ul> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13553">PHPBB3-13553</a>] - Controller helper needs a message handler to replace error handler</li> + </ul> + <a name="v312"></a><h3>Changes since 3.1.2</h3> <h4>Security</h4> diff --git a/phpBB/phpbb/db/migration/data/v31x/v313rc2.php b/phpBB/phpbb/db/migration/data/v31x/v313rc2.php new file mode 100644 index 0000000000..d832d6f502 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v313rc2.php @@ -0,0 +1,32 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v313rc2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v30x\release_3_0_13_pl1', + '\phpbb\db\migration\data\v31x\v313rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.3-RC2')), + ); + } +} |