1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-12 07:24:31 +02:00
Commit Graph

28439 Commits

Author SHA1 Message Date
Marc Alexander
e32694920b Merge pull request #5767 from marc1706/ticket/16224-master
[ticket/16224] Update composer dependencies - master version
2019-12-13 20:17:06 +01:00
Marc Alexander
94f85fee06 Merge branch '3.3.x' 2019-12-12 18:21:12 +01:00
Marc Alexander
d9749d5bb0 Merge branch '3.2.x' into 3.3.x 2019-12-12 18:20:56 +01:00
Marc Alexander
4b376de3bf Merge pull request #5771 from JoshyPHP/ticket/16251
[ticket/16251] Prevent shortened links from overriding other plugins
2019-12-12 18:20:49 +01:00
Marc Alexander
7dbd6abe8e Merge branch '3.3.x' 2019-12-12 18:17:06 +01:00
Marc Alexander
b7492a7b6f Merge branch '3.2.x' into 3.3.x 2019-12-12 18:17:00 +01:00
Marc Alexander
d17c4a12e5 Merge branch 'ticket/16224-3.3.x' into ticket/16224-master 2019-12-12 18:16:11 +01:00
Marc Alexander
59afb76df4 Merge branch 'ticket/16224' into ticket/16224-3.3.x 2019-12-12 18:13:25 +01:00
Marc Alexander
e584ce4010 [ticket/16224] Update fast-image-size to 1.1.6
PHPBB3-16224
2019-12-12 18:02:38 +01:00
JoshyPHP
5813b5fbee [ticket/16252] Ignore non-BBCodes when looking for unauthorized markup
PHPBB3-16252
2019-12-09 18:06:30 +01:00
JoshyPHP
6758190afd [ticket/16251] Prevent shortened links from overriding other plugins
PHPBB3-16251
2019-12-09 02:16:01 +01:00
Marc Alexander
e734b1aca0 Merge branch '3.3.x' 2019-12-06 08:31:58 +01:00
Marc Alexander
5be4cca408 Merge pull request #5748 from marc1706/ticket/16226
[ticket/16226] Prevent Apache servers from using MultiViews
2019-12-06 08:31:53 +01:00
Marc Alexander
e51683511a Merge branch '3.3.x' 2019-12-06 07:22:52 +01:00
Marc Alexander
3009e7ffbe Merge branch '3.2.x' into 3.3.x 2019-12-06 07:20:34 +01:00
Marc Alexander
1f00e160ab Merge pull request #5737 from marc1706/ticket/16211
[ticket/16211] Prevent skipping COPPA via URL parameter
2019-12-06 07:20:30 +01:00
Marc Alexander
1a50719e4c Merge branch '3.3.x' 2019-12-06 07:12:50 +01:00
Marc Alexander
d7425b4998 Merge pull request #5756 from mrgoldy/ticket/16239
[ticket/16239] Remove deprecated phpbb\db\tools
2019-12-06 07:12:46 +01:00
Marc Alexander
2c8e6e400c Merge branch '3.3.x' 2019-12-06 07:03:39 +01:00
Marc Alexander
186384e514 Merge branch '3.2.x' into 3.3.x 2019-12-06 07:03:35 +01:00
3D-I
e6c45623ea [ticket/16247] Quote PM has no identifier
Code review

PHPBB3-16247
2019-12-05 23:42:12 +01:00
3D-I
8c42a9d900 [ticket/16247] Code consistency
PHPBB3-16247
2019-12-05 11:58:05 +01:00
3D-I
d3749538f1 [ticket/16247] Quote PM has no identifier
PHPBB3-16247
2019-12-05 10:15:54 +01:00
Marc Alexander
ad282f09a0 Merge branch '3.3.x' 2019-12-04 21:11:45 +01:00
Marc Alexander
f9a364074d Merge branch '3.2.x' into 3.3.x 2019-12-04 21:11:40 +01:00
Marc Alexander
3002cee42a Merge pull request #5761 from AlfredoRamos/ticket/16242
[ticket/16242] Fix nginx redirection loop
2019-12-04 21:11:35 +01:00
Marc Alexander
720e489df6 Merge branch 'ticket/16224-3.3.x' into ticket/16224-master 2019-12-04 20:41:34 +01:00
Marc Alexander
f26e83e4c6 Merge branch 'ticket/16224' into ticket/16224-3.3.x 2019-12-04 20:39:38 +01:00
Marc Alexander
37ccd29558 [ticket/16224] Update composer dependencies
PHPBB3-16224
2019-12-04 20:31:28 +01:00
Marc Alexander
223f8aad5a Merge branch '3.3.x' 2019-12-04 20:12:49 +01:00
Marc Alexander
5ef225381d Merge pull request #5752 from rxu/ticket/16236
[ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4
2019-12-04 20:11:18 +01:00
Alfredo Ramos
9c980256bf [ticket/16242] Fix nginx redirection loop
PHPBB3-16242
2019-12-03 01:43:44 -06:00
Marc Alexander
cda0d62c12 Merge branch '3.3.x' 2019-12-01 11:36:30 +01:00
Marc Alexander
8ee56d73d8 Merge pull request #5545 from mrgoldy/ticket/15538
[ticket/15538] Twig icon function
2019-12-01 11:35:01 +01:00
Matt Friedman
68326c6aa1 [ticket/16241] Color Palette backwards compatibility
PHPBB3-16241
2019-11-30 09:17:08 -08:00
mrgoldy
811fbbeb92 [ticket/15538] Allow array of icons: icon_name => boolean
PHPBB3-15538
2019-11-30 15:55:21 +01:00
mrgoldy
670dbaba1b [ticket/16239] Remove deprecated phpbb\db\tools
PHPBB3-16239
2019-11-30 15:12:35 +01:00
mrgoldy
23a2c0c9c7 [ticket/15538] 404 SVG and viewBox
PHPBB3-15538
2019-11-30 15:01:25 +01:00
mrgoldy
c47f9d5744 [ticket/15538] Drop templates and icons folder, twig file extension
PHPBB3-15538
2019-11-30 13:22:11 +01:00
rxu
6d71748e9a [ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4
PHPBB3-16236
2019-11-29 23:00:05 +07:00
Marc Alexander
0a01b3bcc8 Merge branch '3.3.x' 2019-11-28 21:39:50 +01:00
Marc Alexander
5d5c3481b7 Merge branch '3.2.x' into 3.3.x 2019-11-28 21:39:45 +01:00
Marc Alexander
d48e0f7f13 Merge pull request #5730 from 3D-I/ticket/16203
[ticket/16203] Enable Emojis and rich text in sent Emails
2019-11-28 21:39:40 +01:00
Marc Alexander
c89c8c92cd Merge branch '3.3.x' 2019-11-28 21:24:47 +01:00
Marc Alexander
3837d2cfee Merge pull request #5749 from 3D-I/ticket/16227
[ticket/16227] Fix undefined vars on login
2019-11-28 21:24:42 +01:00
Marc Alexander
f547024751 Merge branch '3.3.x' 2019-11-28 21:11:54 +01:00
Marc Alexander
ac6676a144 Merge branch '3.2.x' into 3.3.x 2019-11-28 21:11:48 +01:00
Marc Alexander
c6a354e59c Merge branch '3.3.x' 2019-11-28 20:46:12 +01:00
Marc Alexander
3986273fdb Merge pull request #5750 from mrgoldy/ticket/12539
[ticket/12539] Rebind live member search navigation
2019-11-28 20:46:07 +01:00
Marc Alexander
417271f573 [ticket/16211] Use form to ensure link data is passed on coppa registration
PHPBB3-16211
2019-11-27 22:01:26 +01:00