mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-24 21:26:24 +02:00
Code Issues Releases Wiki Activity
31,383 Commits 10 Branches 193 Tags
b4535658f33b516e8841bf5465198c5d38ceef2b
Commit Graph

10920 Commits

Author SHA1 Message Date
Marc Alexander
2b8c8973e9 Merge branch '3.2.x' 2018-02-21 21:14:07 +01:00
Marc Alexander
f17bd9e1e0 Merge pull request #5094 from JoshyPHP/ticket/15518 
[ticket/15518] Add a setting to toggle permission checks for pms in viewtopic
 2018-02-21 21:14:00 +01:00
Marc Alexander
4981f4cddd Merge branch '3.2.x' 2018-01-27 12:58:26 +01:00
hubaishan
1e1097f06f [ticket/15507] Fix PHP 7.2 warning in functions_messenger.php 
By pre assgin `$extra_headers` to array.

PHPBB3-15507
 2018-01-25 23:00:40 +03:00
Marc Alexander
ca537a691d Merge branch '3.2.x' 2018-01-24 19:16:28 +01:00
Marc Alexander
928a8c0e89 Merge pull request #5100 from senky/ticket/15528 
[ticket/15528] Display style phpBB version
 2018-01-24 19:16:24 +01:00
Marc Alexander
ef6b6b156d Merge branch '3.2.x' 2018-01-24 19:09:29 +01:00
Jakub Senko
875dc63c6f [ticket/15529] Color groups in ACP 
PHPBB3-15529
 2018-01-21 11:04:07 +01:00
Jakub Senko
abe218c34a [ticket/15528] Display style phpBB version 
PHPBB3-15528
 2018-01-21 10:54:07 +01:00
Marc Alexander
d0c93d56ad Merge branch '3.2.x' 2018-01-20 19:57:38 +01:00
Marc Alexander
d0143bec88 Merge pull request #5084 from hubaishan/ticket/15510 
[ticket/15510] Link Orphan attachments in ACP General to its page
 2018-01-20 19:57:33 +01:00
Marc Alexander
8b03b9ded2 Merge branch '3.2.x' 2018-01-20 19:45:50 +01:00
canonknipser
122f61e1ca [ticket/15513] Signature edit in acp gives error 
When editing a users signature in acp, a error is thrown.

PHPBB3-15513
 2018-01-20 18:00:44 +01:00
JoshyPHP
f01e29effe [ticket/15518] Add a setting to toggle permission checks for pms in viewtopic 
PHPBB3-15518
 2018-01-17 00:16:26 +01:00
Marc Alexander
ab65accebc Merge branch '3.2.x' 2018-01-16 21:34:23 +01:00
Marc Alexander
1cd8bbac0c Merge pull request #5071 from dsinn/ticket/15495 
[ticket/15495] Use transaction in ACP move_forum
 2018-01-16 21:34:20 +01:00
hubaishan
baabcad8ab [ticket/15510] Link Orphan attachments in ACP General to its page 
Link Orphan attachments in ACP General to Orphaned attachments page
if Orphan attachments>0

PHPBB3-15510
 2018-01-12 18:23:16 +03:00
Derky
3d409d4932 Merge branch '3.2.x' 2018-01-11 21:45:46 +01:00
Marc Alexander
350d4f3e6d [ticket/15506] Assign attachrow_template_vars before foreach 
The attachrow_template_vars array needs to be defined once in front of the
foreach instead of resetting the array on every iteration of the foreach.

PHPBB3-15506
 2018-01-11 21:00:19 +01:00
Marc Alexander
6b221ae4cb Merge branch '3.2.x' 2018-01-07 19:30:41 +01:00
Marc Alexander
f26cf2dc1f [3.2.x] Update versions to 3.2.3-dev 2018-01-07 18:51:18 +01:00
Marc Alexander
69a168bcb2 Merge pull request #5074 from marc1706/ticket/15498 
[ticket/15498] Do not pass whether URL uses router to is_route
 2018-01-07 11:04:37 +01:00
Marc Alexander
1b4bad6583 Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 2018-01-07 11:02:31 +01:00
Marc Alexander
3ae0169542 Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2 2018-01-07 10:48:43 +01:00
Marc Alexander
e31474542d [ticket/15498] Do not pass whether URL uses router to is_route 
is_route expects a flag of whether this is a route that was generated
with the router as opposed to is_router_used() which returns whether
the router will be used via app.php.

PHPBB3-15498
 2018-01-06 10:53:12 +01:00
Derky
7560ffcbe9 Merge branch '3.2.x' 2018-01-05 22:52:33 +01:00
Derky
182a96f273 Merge pull request #4680 from marc1706/ticket/15055 
[ticket/15055] Add appveyor file to allow running tests on appveyor as well
 2018-01-05 22:44:34 +01:00
Daniel Sinn
84ccb3aded [ticket/15495] Use transaction in ACP move_forum 
Should prevent the forums table from getting messed up if an error or
concurrent execution happens.

PHPBB3-15495
 2018-01-03 16:18:14 -05:00
Marc Alexander
66143e99be [ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility 
PHPBB3-15055
 2018-01-01 18:54:08 +01:00
rxu
f8fbe37936 [ticket/14972] replace all occurrences of sizeof() with the count() 
PHPBB3-14972
 2018-01-01 13:56:04 +01:00
rxu
8c3808e9e7 [ticket/14972] Fix sizeof calls 
As of PHP 7.2, only arrays and objects implementing the Countable interface
should be passed as a count() or sizeof() parameter.
See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198
Also, sizeof() seems to be sheduled for deprecation, see
https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations

PHPBB3-14972
 2018-01-01 13:08:12 +01:00
Marc Alexander
bf5f11e11a Merge branch 'ticket/security/211' into ticket/security/211-rhea 2018-01-01 11:54:37 +01:00
Marc Alexander
7dfd57077a Merge pull request #40 from phpbb/ticket/security/211 
[ticket/security/211] Make sure website URL only uses http & https schemes
 2017-12-31 16:37:58 +01:00
Marc Alexander
92350db572 [prep-release-3.1.12] Update version numbers to 3.1.12 2017-12-31 16:36:16 +01:00
Marc Alexander
0ff5f9fa0e [3.2.x] Update version number to 3.2.3-dev 2017-12-28 22:03:10 +01:00
Marc Alexander
ca4a3f4698 [prep-release-3.2.2] Update version to 3.2.2-RC1 2017-12-28 14:58:01 +01:00
Marc Alexander
ea1d911508 Merge branch '3.2.x' 2017-12-28 10:43:31 +01:00
Marc Alexander
7c0ff6ddd4 Merge pull request #5045 from senky/ticket/15454 
[ticket/15454] Add core.mcp_queue_approve_details_template
 2017-12-28 10:43:27 +01:00
Marc Alexander
b6ac183a32 [ticket/15454] Add post template data to event 
PHPBB3-15454
 2017-12-28 09:09:21 +01:00
Marc Alexander
19c8112e99 Merge branch '3.2.x' 2017-12-28 08:29:32 +01:00
Marc Alexander
0b52923129 Merge pull request #5044 from hubaishan/ticket/15453 
[ticket/15453] Add core event after language deleted in acp_language.php
 2017-12-28 08:29:28 +01:00
Marc Alexander
a12ad9c914 Merge branch '3.2.x' 2017-12-27 21:31:36 +01:00
Marc Alexander
01181f1e4e Merge pull request #5040 from kasimi/ticket/15446 
[ticket/15446] Add event core.acp_profile_action
 2017-12-27 21:31:31 +01:00
Marc Alexander
59c7a5506b Merge branch '3.2.x' 2017-12-27 21:27:15 +01:00
Marc Alexander
d8f9cb4961 Merge pull request #5041 from kasimi/ticket/15447 
[ticket/15447] Add event core.acp_profile_modify_profile_row
 2017-12-27 21:27:11 +01:00
hubaishan
c906335ce4 [ticket/15453] Add core event after language deleted in acp_language.php 
Add core event after language deleted in acp_language.php

PHPBB3-15453
 2017-12-27 20:54:15 +01:00
Marc Alexander
a89fdabb35 Merge branch '3.2.x' 2017-12-27 20:44:44 +01:00
Marc Alexander
d1f10d54fc Merge pull request #5055 from dsinn/ticket/15471 
[ticket/15471] Add core events to ACP when pruning a forum
 2017-12-27 20:44:40 +01:00
Marc Alexander
3bc3c7febc Merge branch '3.2.x' 2017-12-27 20:28:14 +01:00
Marc Alexander
bdda36798b Merge pull request #5064 from rxu/ticket/15486 
[ticket/15486] Add core event to the user_add() to modify notifications data
 2017-12-27 20:28:10 +01:00