commit: 055d7658db7817b80d00b27d6e99cad961d0ee15
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Mon Apr 29 06:35:30 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 06:35:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=055d7658
Merge branch 'prep-release-3.2.6' into 3.2.x
build/build.xml | 2 +-
phpBB/docs/CHANGELOG.html | 18 ++++++++++
phpBB/includes/acp/acp_board.php | 10 ++++--
phpBB/includes/functions.php | 19 +++++++++--
phpBB/includes/functions_acp.php | 12 ++++++-
phpBB/index.php | 3 ++
phpBB/install/phpbbcli.php | 2 +-
phpBB/install/schemas/schema_data.sql | 4 +--
phpBB/language/en/acp/board.php | 4 +--
phpBB/language/en/acp/common.php | 1 +
phpBB/phpbb/avatar/driver/upload.php | 3 +-
phpBB/phpbb/avatar/manager.php | 2 +-
...ermission_add.php => disable_remote_avatar.php} | 9 +++--
.../{jquery_update.php => smtp_dynamic_data.php} | 21 +++++++-----
.../db/migration/data/v32x/{v321.php => v326.php} | 11 ++++---
phpBB/phpbb/install/helper/config.php | 2 ++
phpBB/phpbb/search/fulltext_native.php | 38 +++++++++++++++++-----
phpBB/styles/prosilver/template/index_body.html | 1 +
phpBB/styles/prosilver/template/login_body.html | 1 +
tests/avatar/manager_test.php | 2 +-
tests/functions_acp/validate_config_vars_test.php | 10 +++++-
tests/search/native_test.php | 8 ++---
.../test_framework/phpbb_functional_test_case.php | 8 +++++
23 files changed, 146 insertions(+), 45 deletions(-)
diff --cc build/build.xml
index 386fd6b53,d1232a97f..49ff9d9b7
--- a/build/build.xml
+++ b/build/build.xml
@@@ -2,9 -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.2.6" />
- <property name="prevversion" value="3.2.5" />
- <property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3,
3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12,
3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1,
3.2.2, 3.2.3, 3.2.4, 3.2.6-RC1" />
+ <property name="newversion" value="3.2.7-dev" />
- <property name="prevversion" value="3.2.6-RC1" />
++ <property name="prevversion" value="3.2.6" />
+ <property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3,
3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12,
3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.1,
3.2.2, 3.2.3, 3.2.4, 3.2.5" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />
