Tristan Darricau
e247a0f6ea
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15618] Display The team link only to users with permission
2018-07-08 18:41:04 +02:00
Tristan Darricau
078d076526
Merge pull request #5253 from senky/ticket/15618
...
[ticket/15618] Display The team link only to users with permission
* github.com:/phpbb/phpbb:
[ticket/15618] Display The team link only to users with permission
2018-07-08 18:41:04 +02:00
Tristan Darricau
f6301ea85a
Merge pull request #5266 from senky/ticket/12624
...
[ticket/12624] Add debug.load_time parameter
* github.com:/phpbb/phpbb:
[ticket/12624] Add debug.load_time parameter
2018-07-08 18:32:45 +02:00
Tristan Darricau
7cf35eafb5
Merge pull request #5267 from senky/ticket/12627
...
[ticket/12627] Add debug.sql_explain parameter
* github.com:/phpbb/phpbb:
[ticket/12627] Add debug.sql_explain parameter
2018-07-08 18:26:52 +02:00
Tristan Darricau
4829dfe487
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15676] Use paragraphs and classes as suggested by hanakin
[ticket/15676] Use twig syntax
[ticket/15676] Simplify link text and use privacy link in cookie notice
[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:40:26 +02:00
Tristan Darricau
bc7b998632
Merge branch 'prep-release-3.2.3' into 3.2.x
...
* prep-release-3.2.3:
[ticket/15676] Use paragraphs and classes as suggested by hanakin
[ticket/15676] Use twig syntax
[ticket/15676] Simplify link text and use privacy link in cookie notice
[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
2018-07-08 17:38:27 +02:00
Jakub Senko
bdff0f5590
[ticket/12627] Add debug.sql_explain parameter
...
PHPBB3-12627
2018-07-06 17:17:48 +02:00
Jakub Senko
fcc3dd996d
[ticket/12624] Add debug.load_time parameter
...
PHPBB3-12624
2018-07-06 17:01:15 +02:00
Marc Alexander
857b55dd20
Merge branch '3.2.x'
2018-06-19 13:32:49 +02:00
Rubén Calvo
d4d8aec02a
[ticket/15695] Fix gen_rand_string returning less characters than expected
...
PHPBB3-15695
2018-06-18 22:38:14 +02:00
Jakub Senko
c61b9358ff
[ticket/15618] Display The team link only to users with permission
...
PHPBB3-15618
2018-06-18 12:55:24 +02:00
Marc Alexander
1d0046437b
Merge branch '3.2.x'
2018-06-17 15:44:33 +02:00
Marc Alexander
9e50e52fa5
[ticket/15693] Update tests to reflect changes to gen_rand_string()
...
PHPBB3-15693
2018-06-17 11:01:11 +02:00
Rubén Calvo
f75c400db4
[ticket/15693] Fix get_rand_string()
...
PHPBB3-15693
2018-06-15 19:22:35 +02:00
Marc Alexander
25a46ef4b3
[ticket/15676] Simplify link text and use privacy link in cookie notice
...
PHPBB3-15676
2018-05-31 22:15:36 +02:00
Marc Alexander
c6a35237a2
[ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
...
PHPBB3-15676
2018-05-31 09:31:33 +02:00
Rubén Calvo
ef43dbdcca
[ticket/15286] Update use storage in avatars
...
PHPBB3-15286
2018-05-01 10:47:11 +02:00
Marc Alexander
6b221ae4cb
Merge branch '3.2.x'
2018-01-07 19:30:41 +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
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
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
f2f1037e8d
Merge branch '3.2.x'
2017-10-17 21:16:15 +02:00
Marc Alexander
0e9a1e0d54
Merge pull request #4910 from javiexin/ticket/15331_B
...
[ticket/15331] Allow gravatars to be overridden by existing event - B
2017-10-17 21:13:40 +02:00
Marc Alexander
d64ce15ecf
Merge branch '3.2.x'
2017-10-11 21:00:38 +02:00
Rubén Calvo
7b489638d7
[ticket/15172] Cast port to integer
...
PHPBB3-15172
2017-09-10 13:24:10 +02:00
Rubén Calvo
3f9de5b1d4
[ticket/15172] Use symfony request component to get port
...
PHPBB3-15172
2017-09-09 17:32:06 +02:00
Máté Bartus
dababbb9ad
Merge branch '3.2.x'
2017-09-09 12:09:50 +02:00
Tristan Darricau
c368d170cf
[ticket/15351] Makes confirm_works in a router context (app.php)
...
PHPBB3-15351
2017-09-08 16:26:39 +02:00
Rubén Calvo
2afada5a5a
[ticket/15276] Remove avatar_path
...
PHPBB3-15276
2017-08-25 15:31:58 +02:00
javiexin
e6796a690c
[ticket/15331] Allow gravatars to be changed in the existing event
...
Option B:
- change the get_avatar function
PHPBB3-15331
2017-08-19 22:36:47 +02:00
Marc Alexander
0aba1faa08
[ticket/security/211] Do not match javascript URIs with URL regexes
...
SECURITY-211
2017-07-26 21:14:05 +02:00
Marc Alexander
882a3c3831
[ticket/security/211] Make sure website URL only uses http & https schemes
...
SECURITY-211
2017-07-22 17:38:04 +02:00
Rubén Calvo
603a8c51da
[ticket/15253] Move storage helper to filesystem
...
PHPBB3-15253
2017-07-20 19:55:52 +02:00
Rubén Calvo
ecb79539f4
[ticket/15253] Use storage helper methods instead of filesystem methods
...
PHPBB3-15253
2017-07-20 19:55:52 +02:00
rxu
055a5f8040
[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
2017-07-17 16:56:54 +07:00
Marc Alexander
f101532c09
Merge branch '3.2.x'
2017-07-16 21:42:30 +02:00
Marc Alexander
34e9b4d066
Merge pull request #35 from phpbb/ticket/security-203-rhea
...
[ticket/security-203] Fully validate version check data in version helper -- Rhea
2017-07-16 15:29:35 +02:00
Tristan Darricau
1f9a269d78
[ticket/11150] Makes the customisation db lync dynamic
...
PHPBB3-11150
2017-04-23 21:09:59 +02:00
Marc Alexander
663bdda53c
Merge branch '3.2.x'
2017-01-07 00:20:22 +01:00
Marc Alexander
e0eeea800c
[ticket/14961] Add cookie notice as enablable feature
...
Uses Insites cookieconsent v3.0.3:
https://cookieconsent.insites.com
PHPBB3-14961
2017-01-06 00:57:12 +01:00
Marc Alexander
d63b644b2b
Merge branch 'ticket/security-203' into ticket/security-203-rhea
2016-12-28 22:53:59 +01:00
Marc Alexander
658820654f
[ticket/security-203] Fully validate version check data in version helper
...
This will also take care of SECURITY-204 as it's the same underlying issue.
Admins still need to ensure they don't visit malicious sites for URLs
provided by extensions.
SECURITY-203
2016-12-26 22:01:51 +01:00
Marc Alexander
7fb6d3e414
Merge branch '3.2.x'
2016-11-27 20:45:14 +01:00
Marc Alexander
0e8a573a71
Merge branch '3.1.x' into 3.2.x
2016-11-27 20:45:12 +01:00
Marc Alexander
82960414f7
Merge branch '3.2.x'
2016-11-17 09:56:59 +01:00
Jakub Senko
e974f338af
[ticket/14739] Remove SQLite 2.8.x database driver
...
PHPBB3-14739
2016-11-16 17:59:28 +01:00
Jakub Senko
260dc5ed7c
[ticket/14863] Properly treat plural rules in confirmation box title
...
PHPBB3-14863
2016-11-13 17:21:41 +01:00
Tristan Darricau
c563fe3cc5
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:11 +02:00