1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 09:30:34 +01:00

31354 Commits

Author SHA1 Message Date
Marc Alexander
a7c02304a5
Merge branch '3.2.x' into 3.3.x 2019-09-20 22:23:06 +02:00
Marc Alexander
f0afccb173
Merge branch 'prep-release-3.2.8' into 3.2.x 2019-09-20 22:21:47 +02:00
Marc Alexander
b94464d063
[prep-release-3.2.8] Add migration for 3.2.8 release-3.2.8 2019-09-08 21:53:52 +02:00
Marc Alexander
08842e6ba5
[prep-release-3.2.8] Update version numbers for 3.2.8 release 2019-09-08 21:52:42 +02:00
Marc Alexander
ae00da85ec
[prep-release-3.2.8] Update changelog for 3.2.8 2019-09-08 21:50:46 +02:00
Marc Alexander
6757450a0f
[prep-release-3.2.8] Update CREDITS.txt 2019-09-08 21:42:02 +02:00
Marc Alexander
a9a44c295f
Merge pull request #5679 from mrgoldy/ticket/16123
[ticket/16123] Show proper banned email message
2019-09-08 21:37:54 +02:00
Marc Alexander
4abdfd1709
[ticket/16123] Specify ban_id in validate email fixture
PHPBB3-16123
2019-09-08 09:40:56 +02:00
Marc Alexander
d186df8cb4
[ticket/16123] Purge cache to ensure up to date ban list in tests
PHPBB3-16123
2019-09-07 21:59:17 +02:00
mrgoldy
6e20cd5d22
[ticket/16123] Remove redundant if check
PHPBB3-16123
2019-09-07 21:59:06 +02:00
Marc Alexander
cf898133a4
[ticket/16123] Add tests to cover different ban reasons
PHPBB3-16123
2019-09-07 21:59:01 +02:00
mrgoldy
56e2f1a3f6
[ticket/16123] Check with empty()
PHPBB3-16123
2019-09-07 21:58:47 +02:00
mrgoldy
850ea776d9
[ticket/16123] Show proper banned email message
PHPBB3-16123
2019-09-07 21:58:42 +02:00
Marc Alexander
954c0ddf3e
Merge pull request #54 from phpbb/ticket/security/243
[ticket/security/243] Remove invalid markup from bbcode.html
2019-09-02 21:39:52 +02:00
Marc Alexander
f84cc449b9
[ticket/security/243] Remove invalid markup from bbcode.html
SECURITY-243
2019-09-02 21:18:12 +02:00
Marc Alexander
d613984660
Merge branch '3.2.x' into 3.3.x 2019-09-01 13:33:05 +02:00
Marc Alexander
4db585a4cb
Merge pull request #5666 from mrgoldy/ticket/16084
[ticket/16084] Remove redundant backup radio button
2019-09-01 13:33:00 +02:00
Marc Alexander
dcafa6a711
Merge pull request #5659 from rubencm/ticket/16131
[ticket/16131] Force vagrant to install phpBB with php7.2
2019-09-01 13:01:50 +02:00
Marc Alexander
01e64dbc9c
Merge pull request #53 from phpbb/ticket/security/243
[ticket/security/243] Fail silently on unsupported values for font size
2019-08-31 21:31:25 +02:00
Marc Alexander
cc8d6a5a01
[ticket/security/243] Fail silently on unsupported values for font size
SECURITY-243
2019-08-31 18:16:18 +02:00
Marc Alexander
b4f9c44b30
Merge pull request #5070 from rxu/ticket/15467
[ticket/15467] Fix JS for permissions setting
2019-08-31 16:24:45 +02:00
mrgoldy
88ec8cdcc6 [ticket/16084] Remove redundant backup radio button
PHPBB3-16084
2019-08-26 00:28:51 +02:00
Marc Alexander
42e278e1c3
Merge pull request #52 from phpbb/ticket/security/247
[ticket/security/247] Disable loading of local files on client side
2019-08-25 18:28:56 +02:00
Marc Alexander
79be901cea
Merge pull request #51 from phpbb/ticket/security/243
[ticket/security/243] Limit size BBCode to int
2019-08-25 18:28:08 +02:00
Marc Alexander
26215517dd
Merge pull request #50 from phpbb/ticket/security/246
[ticket/security/246] Check form key no matter if submit is set
2019-08-25 18:27:30 +02:00
Marc Alexander
31aeac5745
Merge pull request #49 from phpbb/ticket/security/244
[security/244] Add form token check to plupload
2019-08-25 18:22:53 +02:00
Marc Alexander
59f489c01f
[ticket/security/244] Add missing form parameters to tests
SECURITY-244
2019-08-24 22:23:38 +02:00
Marc Alexander
6c8d006336
[ticket/security/244] Add parse_attachment form token check to posting.php
SECURITY-244
2019-08-24 22:23:38 +02:00
Marc Alexander
56477a8f7c
[ticket/security/244] Add form token check to plupload
SECURTIY-244
2019-08-24 22:23:38 +02:00
Marc Alexander
525c940385
Merge pull request #5661 from Crizz0/ticket/16136
[ticket/16136] Reword sentence for account already linked
2019-08-24 22:00:45 +02:00
Marc Alexander
2762b93e4a
Merge pull request #5662 from kinerity/ticket/16134
[ticket/16134] Exclude group leaders on group member purge
2019-08-24 21:58:06 +02:00
Christian Schnegelberger
b0465a6202 [ticket/16136] Implement extended explaination
PHPBB3-16136
2019-08-22 18:37:23 +02:00
kinerity
54c684051b
[ticket/16134] Exclude group leaders on group member purge
PHPBB3-16134
2019-08-22 14:07:45 +02:00
Christian Schnegelberger
29a77ea10d [ticket/16136] Reword sentence for account already linked
PHPBB3-16136
2019-08-19 20:41:27 +02:00
Marc Alexander
0b843505e8
Merge branch '3.2.x' into 3.3.x 2019-08-17 21:48:12 +02:00
Marc Alexander
9c15594fe4
[3.2.x] Update version numbers to 3.2.9-dev 2019-08-17 21:44:17 +02:00
Marc Alexander
5080c3e088
Merge branch 'prep-release-3.2.8' into 3.2.x 2019-08-17 21:42:42 +02:00
Marc Alexander
0f1643374e
[prep-release-3.2.8] Update changelog for 3.2.8-RC1 release-3.2.8-RC1 2019-08-17 11:24:20 +02:00
Marc Alexander
62a68def57
[prep-release-3.2.8] Add migration for 3.2.8-RC1 2019-08-17 11:21:06 +02:00
Marc Alexander
815cb84ea5
[prep-release-3.2.8] Update version numbers to 3.2.8 2019-08-17 11:19:06 +02:00
Marc Alexander
f3d89e0e08
[prep-release-3.2.8] Update version numbers to 3.2.8-RC1 2019-08-17 11:18:05 +02:00
Marc Alexander
d4652c1b20
Merge branch '3.2.x' into 3.3.x 2019-08-17 11:14:00 +02:00
Marc Alexander
e59af343b8
Merge pull request #5658 from rubencm/ticket/13175
[ticket/13175] Check if account is already linked when using OAuth
2019-08-17 11:13:51 +02:00
Marc Alexander
7dd822942a
Merge branch '3.2.x' into 3.3.x 2019-08-17 11:02:16 +02:00
Marc Alexander
9a992a4866
Merge pull request #5656 from 3D-I/ticket/16019
[ticket/16019] Deny prosilver's uninstallation
2019-08-17 11:02:08 +02:00
Marc Alexander
826cc9751a
Merge branch '3.2.x' into 3.3.x 2019-08-16 12:24:46 +02:00
Marc Alexander
2d8c5efbd2
Merge pull request #5657 from Crizz0/ticket/15745
[ticket/15745] Uses {{ CREDIT_LINE }} instead of hardcoded language
2019-08-16 12:24:42 +02:00
Marc Alexander
f5f03d24e9
Merge branch '3.2.x' into 3.3.x 2019-08-15 10:47:34 +02:00
Marc Alexander
93a472f08e
Merge pull request #5654 from 3D-I/ticket/16080
[ticket/16080] ACP - Provide meaningful error msg for deleted installed style
2019-08-15 10:47:29 +02:00
3D-I
6de0c7bc66 [ticket/16019] Amend explanation
PHPBB3-16019
2019-08-14 20:09:13 +02:00