Skip to content

Commit 7ca0ec3

Browse files
marc1706marc1706
committed
Merge branch '3.3.x'
2 parents 5349e29 + d46228d commit 7ca0ec3

3 files changed

Lines changed: 94 additions & 2 deletions

File tree

‎build/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
55
<property name="newversion" value="4.0.0-a2-dev" />
6-
<property name="prevversion" value="3.3.15" />
7-
<property name="olderversions" value="3.1.12, 3.2.11, 3.3.14, 4.0.0-a1" />
6+
<property name="prevversion" value="3.3.16-RC1" />
7+
<property name="olderversions" value="3.1.12, 3.2.11, 3.3.15, 4.0.0-a1" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ <h1>Changelog</h1>
5151
<li><a href="#changelog">Changelog</a>
5252
<ul>
5353
<li><a href="#v33x">Changes since 3.3.x</a></li>
54+
<li><a href="#v3315">Changes since 3.3.15</a></li>
5455
<li><a href="#v3315rc1">Changes since 3.3.15-RC1</a></li>
5556
<li><a href="#v3314">Changes since 3.3.14</a></li>
5657
<li><a href="#v3314rc1">Changes since 3.3.14-RC1</a></li>
@@ -616,6 +617,61 @@ <h4>Task</h4>
616617
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17544">PHPBB-17544</a>] - Support Codespaces on master</li>
617618
</ul>
618619

620+
<a name="v3315"></a><h3>Changes since 3.3.15</h3>
621+
<h4>Bug</h4>
622+
<ul>
623+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-14401">PHPBB-14401</a>] - Sphinx: Remove ending slash from binlog_path</li>
624+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15085">PHPBB-15085</a>] - HTTP authentication from feeds served via controller</li>
625+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17034">PHPBB-17034</a>] - Rank post limit</li>
626+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17157">PHPBB-17157</a>] - Read Topic Permission With Search permission</li>
627+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17399">PHPBB-17399</a>] - Add select attribute for British English the default language</li>
628+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17475">PHPBB-17475</a>] - Overflow on resynchronize statistics when running on MSSQL with large number of attachments</li>
629+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17477">PHPBB-17477</a>] - Problem with Whois lookups returning incorrect information due to ARIN/RIPE changes</li>
630+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17486">PHPBB-17486</a>] - Upgrade from 3.0 to 3.3 fails with SQL &quot;Incorrect integer value&quot; error</li>
631+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17491">PHPBB-17491</a>] - Ascending posts pagination in version 3.3.15</li>
632+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17504">PHPBB-17504</a>] - Tests fail because of changed label of ondrej/php repo</li>
633+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17506">PHPBB-17506</a>] - PHP fatal error on install</li>
634+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17510">PHPBB-17510</a>] - CodeSniffer ruleset is reported as DEPRECATED</li>
635+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17519">PHPBB-17519</a>] - Cron URLs are encoded incorrectly</li>
636+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17527">PHPBB-17527</a>] - PHP fatal error when decorating Twig phpBB extension service in phpBB extension</li>
637+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17533">PHPBB-17533</a>] - Reverting migrations may cause restoring incorrect data and throw &quot;module exists&quot; exceptions</li>
638+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17563">PHPBB-17563</a>] - CodeSniffer ruleset (PPSSE) not fully compatible with CS 4</li>
639+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17565">PHPBB-17565</a>] - Incorrect exporting PM as CSV for Excel</li>
640+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17580">PHPBB-17580</a>] - Downloading files with a byte range of 8192 bytes causes fatal error</li>
641+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17589">PHPBB-17589</a>] - QA captcha appears on every other login attempt</li>
642+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17622">PHPBB-17622</a>] - Version helper may return update from newer branch</li>
643+
</ul>
644+
<h4>Improvement</h4>
645+
<ul>
646+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-13481">PHPBB-13481</a>] - Explain in ACP Attachment settings images get resized (at client-side)</li>
647+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-15007">PHPBB-15007</a>] - Add Restart link to installer</li>
648+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-16941">PHPBB-16941</a>] - Add Sphinx search backend tests</li>
649+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17498">PHPBB-17498</a>] - Move GitHub Actions Ubuntu 20.04 runners to Ubuntu 22.04</li>
650+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17536">PHPBB-17536</a>] - Add event to Edit forum in ACP to modify template</li>
651+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17538">PHPBB-17538</a>] - Terms and Policy wording improvements</li>
652+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17555">PHPBB-17555</a>] - Improve running of tests on windows runners in GitHub Actions</li>
653+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17570">PHPBB-17570</a>] - Replace an old CSS accessibility hack with a modern, recommended and W3C compliant method</li>
654+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17598">PHPBB-17598</a>] - Deny access to composer files in apache</li>
655+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17605">PHPBB-17605</a>] - Fix homestead and use a fork since is no longer maintained</li>
656+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17620">PHPBB-17620</a>] - Skip whois test when daily rate-limit is reached</li>
657+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17621">PHPBB-17621</a>] - Change U_WARN to use new warn_allowed variable</li>
658+
</ul>
659+
<h4>New Feature</h4>
660+
<ul>
661+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17515">PHPBB-17515</a>] - Add new event to: ucp_pm_viewmessage.html</li>
662+
</ul>
663+
<h4>Task</h4>
664+
<ul>
665+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17110">PHPBB-17110</a>] - Reword &quot;slander&quot; to &quot;libel&quot; in registration legalese</li>
666+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17545">PHPBB-17545</a>] - Improve handling of DDoS/brute force attacks on login form</li>
667+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17584">PHPBB-17584</a>] - Exclude tests from PSR1 code sniffs</li>
668+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17591">PHPBB-17591</a>] - Update to Code Sniffer 4</li>
669+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17593">PHPBB-17593</a>] - Allow functional tests on a secure local server</li>
670+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17612">PHPBB-17612</a>] - Remove imageset to css converter</li>
671+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17613">PHPBB-17613</a>] - Remove support for retired WebPI packages</li>
672+
<li>[<a href="https://tracker.phpbb.com/browse/PHPBB-17628">PHPBB-17628</a>] - Update composer and node dependencies</li>
673+
</ul>
674+
619675
<a name="v3315rc1"></a><h3>Changes since 3.3.15-RC1</h3>
620676
<h4>Bug</h4>
621677
<ul>

‎phpBB/phpbb/db/migration/data/v33x/v3316rc1.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
*
4+
* This file is part of the phpBB Forum Software package.
5+
*
6+
* @copyright (c) phpBB Limited <https://www.phpbb.com>
7+
* @license GNU General Public License, version 2 (GPL-2.0)
8+
*
9+
* For full copyright and license information, please see
10+
* the docs/CREDITS.txt file.
11+
*
12+
*/
13+
14+
namespace phpbb\db\migration\data\v33x;
15+
16+
class v3316rc1 extends \phpbb\db\migration\migration
17+
{
18+
public function effectively_installed()
19+
{
20+
return version_compare($this->config['version'], '3.3.16-RC1', '>=');
21+
}
22+
23+
public static function depends_on()
24+
{
25+
return [
26+
'\phpbb\db\migration\data\v33x\v3315',
27+
];
28+
}
29+
30+
public function update_data()
31+
{
32+
return [
33+
['config.update', ['version', '3.3.16-RC1']],
34+
];
35+
}
36+
}

0 commit comments

Comments
 (0)