From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27569138334 for ; Sat, 4 May 2019 05:20:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 044FCE087F; Sat, 4 May 2019 05:20:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7B67E087E for ; Sat, 4 May 2019 05:20:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E907343496 for ; Sat, 4 May 2019 05:20:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E16A5EC for ; Sat, 4 May 2019 05:20:05 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1556519730.055d7658db7817b80d00b27d6e99cad961d0ee15.chiitoo@gentoo> Subject: [gentoo-commits] proj/forums:origin/3.2.x commit in: / X-VCS-Repository: proj/forums X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 055d7658db7817b80d00b27d6e99cad961d0ee15 X-VCS-Branch: origin/3.2.x Date: Sat, 4 May 2019 05:20:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16d7c118-1c30-4812-a831-8b3df5ace00a X-Archives-Hash: 428ad72d9bf0c0034ee9f49890d2db36 commit: 055d7658db7817b80d00b27d6e99cad961d0ee15 Author: Marc Alexander m-a-styles de> AuthorDate: Mon Apr 29 06:35:30 2019 +0000 Commit: Jimi Huotari gentoo 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 @@@ - - - + - ++ +