* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
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}" />
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: eb1896e6f7f55e3bd65d0be8dfd8fb310bd4e8cd
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Wed May 1 18:33:12 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed May 1 18:33:12 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=eb1896e6
Merge pull request #5580 from mrgoldy/ticket/16039
[ticket/16039] Global dispatcher
phpBB/includes/mcp/mcp_main.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: db43961de63d169b6a3dbe6a75f421cd94f1e5fa
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:23:07 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:23:07 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=db43961d
Merge pull request #46 from phpbb/ticket/security/231
[ticket/security/231] Disable remote avatar functionality & add warning
phpBB/includes/acp/acp_board.php | 3 ++-
phpBB/language/en/acp/board.php | 4 ++--
phpBB/phpbb/avatar/manager.php | 2 +-
..._list_topics_permission_add.php => disable_remote_avatar.php} | 9 ++++++---
4 files changed, 11 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: f75dd1628cd3add8f69128ff63e0c1cd296cd2a3
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:26:36 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:26:36 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=f75dd162
Merge pull request #48 from phpbb/ticket/security/228
[ticket/security/228] Add form token to login box
phpBB/includes/functions.php | 19 +++++++++++++++++--
phpBB/index.php | 3 +++
phpBB/styles/prosilver/template/index_body.html | 1 +
phpBB/styles/prosilver/template/login_body.html | 1 +
4 files changed, 22 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 3075d2fecc9f5bb780bb478c0851a704c7f9b392
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:19:35 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:19:35 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=3075d2fe
Merge pull request #44 from phpbb/ticket/security/235
Ticket/security/235 Wildcard char count in search
phpBB/phpbb/search/fulltext_native.php | 38 ++++++++++++++++++++++++++--------
tests/search/native_test.php | 8 +++----
2 files changed, 33 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 36840fb2e44b272725b6fe89a2b57b984720bfeb
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:14:38 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:14:38 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=36840fb2
Merge pull request #5576 from marc1706/ticket/16027
[ticket/16027] Force clearing of cache folder on install for functional
tests/test_framework/phpbb_functional_test_case.php | 8 ++++++++
1 file changed, 8 insertions(+)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 308dd49bb95b84345efb23e91ea03f9a91c5a2d4
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:21:55 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:21:55 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=308dd49b
Merge pull request #45 from phpbb/ticket/security/234
[ticket/security/234] Add URL validation for input fields & main site URL
phpBB/includes/acp/acp_board.php | 7 +++++--
phpBB/includes/functions_acp.php | 12 +++++++++++-
phpBB/language/en/acp/common.php | 1 +
tests/functions_acp/validate_config_vars_test.php | 10 +++++++++-
4 files changed, 26 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: f3c4587d47af6aa3e39368653b542f97ed3428c6
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 27 11:24:16 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 11:24:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=f3c4587d
Merge pull request #47 from phpbb/ticket/security/233
[ticket/security/233] Make smtp_password and smtp_username dynamic
phpBB/install/schemas/schema_data.sql | 4 ++--
.../{jquery_update.php => smtp_dynamic_data.php} | 21 +++++++++++++--------
phpBB/phpbb/install/helper/config.php | 2 ++
3 files changed, 17 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] proj/forums:origin/3.2.x commit in: /
@ 2019-05-04 5:20 Jimi Huotari
0 siblings, 0 replies; 9+ messages in thread
From: Jimi Huotari @ 2019-05-04 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 446c0459c92055a215baba6009f8515068cb019d
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 20 22:16:06 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 22:16:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=446c0459
Merge branch 'prep-release-3.2.6' into 3.2.x
build/build.xml | 2 +-
phpBB/docs/CHANGELOG.html | 65 ++++++++++++++++++++++
phpBB/includes/constants.php | 2 +-
phpBB/install/convertors/convert_phpbb20.php | 2 +-
phpBB/install/phpbbcli.php | 2 +-
phpBB/install/schemas/schema_data.sql | 2 +-
.../data/v32x/{v325rc1.php => v326rc1.php} | 9 +--
phpBB/styles/prosilver/style.cfg | 4 +-
8 files changed, 77 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-05-04 5:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-04 5:20 [gentoo-commits] proj/forums:origin/3.2.x commit in: / Jimi Huotari
-- strict thread matches above, loose matches on Subject: below --
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
2019-05-04 5:20 Jimi Huotari
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox