Commit graph

11924 commits

Author SHA1 Message Date
Marc Alexander
2c65df7185
Merge branch '3.3.x' 2020-08-30 14:47:35 +02:00
Marc Alexander
0d3dd61ad4
Merge pull request #6007 from rxu/ticket/16526
[ticket/16526] Correctly handle ACP CSV settings
2020-08-30 14:47:20 +02:00
rxu
13aa1ff760
[ticket/16526] Get rid of goto operator
PHPBB3-16526
2020-08-30 18:04:04 +07:00
Marc Alexander
59e5f17cd6
Merge branch '3.3.x' 2020-08-28 21:14:40 +02:00
Marc Alexander
5d0f7229e3
Merge pull request #6019 from rxu/ticket/16488
[ticket/16488] Fix not displaying min input element attribute when 0
2020-08-28 21:14:12 +02:00
Marc Alexander
bdf2e6f709
Merge branch '3.3.x' 2020-08-25 21:05:00 +02:00
Christian Schnegelberger
34d415a6b3 [ticket/16588] Updates link to plural rules from 3.2.x to 3.3.x
PHPBB3-16588
2020-08-25 12:11:56 +02:00
Matt Friedman
9b9ca25934 [ticket/16237] Fix broken vars and remove conditional overhead
PHPBB3-16237
2020-08-21 15:33:08 -07:00
hanakin
bc59782171 [ticket/16237] move color from functions
PHPBB3-16237
2020-08-19 10:40:06 -10:00
hanakin
63c7488f18 [ticket/16237] Add missing template vars
PHPBB3-16237
2020-08-19 10:40:06 -10:00
hanakin
dc4fe2d4b7 [ticket/16237] squash all commits
PHPBB3-16237
2020-08-19 10:40:06 -10:00
Marc Alexander
cb3bd5528f
Merge pull request #5846 from rubencm/ticket/19346
[ticket/16346] Small improvements
2020-08-19 21:10:07 +02:00
Marc Alexander
f1db56f716
Merge branch '3.3.x' 2020-08-19 21:08:59 +02:00
Marc Alexander
1d54d60f04
Merge pull request #6039 from rubencm/ticket/16583
[ticket/16583] Fix cancel button
2020-08-19 21:08:45 +02:00
rubencm
fef1996b3d [ticket/16583] Fix cancel button
PHPBB3-16583
2020-08-19 05:04:28 +00:00
rubencm
52b7125cce [ticket/16346] More fixes
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
4156204419 [ticket/16346] More fixes
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
0478ccee89 [ticket/16346] Remove unused constants
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
03e01bbddd [ticket/16346] Don't use deprecated function
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
774c609c4a [ticket/16345] Small improvements
PHPBB3-16346
2020-08-14 08:29:06 +00:00
Marc Alexander
3cceeb45bf
Merge branch '3.3.x' 2020-08-13 21:16:33 +02:00
Marc Alexander
7d18ecd1bf
Merge pull request #6012 from rxu/ticket/16533
[ticket/16533] Add autologin keys management UCP module events
2020-08-13 21:15:59 +02:00
Marc Alexander
22b04985af
Merge branch '3.3.x' 2020-08-09 14:16:19 +02:00
Marc Alexander
7a1231a32f
Merge pull request #5938 from mrgoldy/ticket/16430
[ticket/16430] Sort permissions
2020-08-09 14:16:12 +02:00
Marc Alexander
5f0b3c2141
Merge branch '3.3.x' 2020-08-06 17:44:03 +02:00
Marc Alexander
e10ea1fcf3
Merge branch 'prep-release-3.3.1' into 3.3.x 2020-08-06 17:26:47 +02:00
Marc Alexander
21d656907a
Merge branch '3.3.x' 2020-08-06 17:23:05 +02:00
Marc Alexander
2a8239075e
Merge branch '3.2.x' into 3.3.x 2020-08-06 17:21:58 +02:00
Marc Alexander
f28b1fd178
Merge branch 'prep-release-3.2.10' into 3.2.x 2020-08-06 17:19:21 +02:00
Marc Alexander
c45df4e820
Merge pull request #6032 from marc1706/ticket/16559
[ticket/16559] Ensure event variables are defined in mcp_queue
2020-08-02 17:18:50 +02:00
Marc Alexander
fa636e35e0
[ticket/16559] Ensure event variables are defined in mcp_queue
PHPBB3-16559
2020-08-02 13:55:06 +02:00
Marc Alexander
bcbe6339ec
[prep-release-3.3.1] Update version numbers to 3.3.1 2020-07-29 21:44:55 +02:00
Marc Alexander
ad43169065
[prep-release-3.2.10] Update version numbers to 3.2.10 2020-07-25 11:25:39 +02:00
Marc Alexander
3be435561a
Merge branch 'prep-release-3.2.10' into prep-release-3.3.1 2020-07-25 11:18:09 +02:00
Marc Alexander
a378e0eb0c
Merge pull request #61 from phpbb/ticket/security-259
[ticket/security-259] Stop checking image size of images in img BBCode
2020-07-25 11:16:07 +02:00
Marc Alexander
8e5a635bfb
Merge pull request #60 from phpbb/ticket/security/257
[ticket/security/257] Enforce http(s) for URLs in image BBCode
2020-07-25 11:16:04 +02:00
Marc Alexander
1dd6d583d0
[ticket/16555] Update jQuery to 3.5.1
PHPBB3-16555
2020-07-24 10:43:56 +02:00
Marc Alexander
2c04ce7a61
Merge branch 'prep-release-3.2.10' into prep-release-3.3.1 2020-07-22 10:08:47 +02:00
Marc Alexander
4d9118447b
Merge pull request #6023 from MichaIng/patch-1
[ticket/16554] Align all .htaccess files to support Apache 2.4 directives
2020-07-21 11:59:57 +02:00
3D-I
193d54c4eb
[ticket/16552] Roll back to FontAwesome 4.7
Add migration font_awesome_5_rollback

PHPBB3-16552
2020-07-21 11:58:28 +02:00
3D-I
4aa3a80558
[ticket/16552] Roll back to FontAwesome 4.7
PHPBB3-16552
2020-07-21 11:58:28 +02:00
Marc Alexander
361e97d097
Merge pull request #6025 from 3D-I/ticket/16550-3.2.x
[ticket/16550] Fix undefined variable url in PMs [3.2.x]
2020-07-21 11:55:19 +02:00
MichaIng
bd4887f660
[ticket/16554] Align all .htaccess files to support Apache 2.4 directives
While the main .htaccess as well as the ones in phpbb/db/migration/data/vXYZ/
do already support the Apache 2.4 mod_authz_core directive "Require all denied",
all others still use only the deprecated "Deny from All". To not force modern
system to use the mod_access_compat module, the modern directives should be
supported in every case.

For this, the method of phpbb/db/migration/data/vXYZ/.htaccess is copied to
update and align all .htaccess files across the source code.

PHPBB3-16554

Signed-off-by: MichaIng <micha@dietpi.com>
2020-07-21 11:21:29 +02:00
rxu
d0197a94fb
[ticket/16539] Fix general SQL error for smilies mode on posting
PHPBB3-16539
2020-07-21 10:11:32 +02:00
3D-I
ecbb37e0ba
[ticket/16550] Fix undefined variable url in PMs
PHPBB3-16550
2020-07-21 10:03:00 +02:00
3D-I
70c289fef0
[ticket/16550] Fix undefined variable url in PMs [3.2.x]
PHPBB3-16550
2020-07-21 10:01:31 +02:00
rxu
fabb5bc7e6
[ticket/16488] Fix not displaying min input element attribute when 0
PHPBB3-16488
2020-07-02 13:21:01 +07:00
Marc Alexander
d0e2023a63
[ticket/security-259] Stop checking image size of images in img bbcode
SECURITY-259
2020-06-25 22:20:58 +02:00
Marc Alexander
65065bf315
[3.3.x] Update version numbers to 3.3.2-dev 2020-06-21 21:29:51 +02:00
Marc Alexander
e8f5e62c44
[prep-release-3.3.1] Update version numbers to 3.3.1-RC1 2020-06-21 14:41:38 +02:00