Commit graph

12069 commits

Author SHA1 Message Date
Marc Alexander
6ab2821c34
[prep-release-3.2.10] Update version numbers for 3.2.10-RC2 2020-06-07 12:03:05 +02:00
Marc Alexander
de834b65e8
Merge pull request #5998 from 3D-I/ticket/16508
[ticket/16508] Fix WhoIs lookup
2020-06-07 09:23:58 +02:00
Marc Alexander
84d82dab53
Merge branch '3.3.x' 2020-06-06 17:17:47 +02:00
Marc Alexander
f72e847c17
Merge branch '3.2.x' into 3.3.x 2020-06-06 17:17:28 +02:00
Marc Alexander
cf40048f67
Merge branch 'prep-release-3.2.10' into 3.2.x 2020-06-06 17:11:01 +02:00
3D-I
af6eebaa1a
[ticket/16508] Fix WhoIs lookup
PHPBB3-16508
2020-06-04 21:20:17 +02:00
3D-I
f8acf53f72
[ticket/16508] Fix WhoIs lookup
PHPBB3-16508
2020-06-04 21:20:17 +02:00
3D-I
73c133c91d
[ticket/16508] Fix WhoIs lookup
PHPBB3-16508
2020-06-04 21:20:17 +02:00
Marc Alexander
6a24d72183
[ticket/16511] Fix typo when checking for phpbb_delete_users_pms()
PHPBB3-16511
2020-06-02 21:22:27 +02:00
Marc Alexander
fe7c833c8b
Merge branch '3.2.x' into 3.3.x 2020-06-01 20:40:12 +02:00
Marc Alexander
1aca32454f
[3.2.x] Update version number to 3.2.11-dev 2020-06-01 20:35:39 +02:00
Marc Alexander
9d2c1f7602
[prep-release-3.2.10] Update version numbers to 3.2.10-RC1 2020-06-01 13:09:27 +02:00
Marc Alexander
6c970be53c
Merge branch '3.3.x' 2020-06-01 11:22:45 +02:00
Marc Alexander
642f990fbc
Merge branch '3.2.x' into 3.3.x 2020-06-01 11:22:37 +02:00
Marc Alexander
7268c5ebfb
Merge pull request #5993 from 3D-I/ticket/16503
[ticket/16503] Fix WhoIs lookup
2020-06-01 11:22:27 +02:00
Marc Alexander
6f5d640e2e
Merge branch '3.3.x' 2020-06-01 11:19:40 +02:00
Marc Alexander
68e6e8ca90
Merge branch '3.2.x' into 3.3.x 2020-06-01 11:19:30 +02:00
rxu
e2ced58517
[ticket/16500] Fix attachments ordering for copy topic feature
PHPBB3-16500
2020-06-01 14:40:49 +07:00
3D-I
555624decf [ticket/16503] Fix WhoIs lookup
PHPBB3-16503
2020-05-30 21:26:45 +02:00
Marc Alexander
dbd17feb5f
Merge branch '3.3.x' 2020-05-24 14:07:47 +02:00
Marc Alexander
aae5852ad3
Merge branch '3.2.x' into 3.3.x 2020-05-24 14:07:37 +02:00
Marc Alexander
e01c998758
Merge pull request #5983 from 3D-I/ticket/16485
[ticket/16485] Fix Emoji in logs for warning message
2020-05-24 14:07:21 +02:00
Marc Alexander
f95e2c053a
Merge branch '3.3.x' 2020-05-17 22:13:37 +02:00
Marc Alexander
ce97122c6d
Merge branch '3.2.x' into 3.3.x 2020-05-17 22:13:04 +02:00
Marc Alexander
4eda5218d5
Merge pull request #5971 from ansavin/ticket/15591
[ticket/15591] Add jabber permission check
2020-05-17 21:37:17 +02:00
Marc Alexander
54e60a76e4
Merge branch '3.3.x' 2020-05-17 21:05:39 +02:00
Marc Alexander
a37f82bb9d
Merge branch '3.2.x' into 3.3.x 2020-05-17 21:04:30 +02:00
Marc Alexander
d0ca73caf8
Merge pull request #5972 from mrgoldy/ticket/15194
[ticket/15194] Group avatar delete
2020-05-17 21:04:13 +02:00
3D-I
bd29de880d [ticket/16485] Fix Emoji in logs for warning message
PHPBB3-16485
2020-05-14 22:08:00 +02:00
Marc Alexander
b1333183a5
Merge branch '3.3.x' 2020-05-14 17:48:27 +02:00
Marc Alexander
e420c9c895
Merge branch '3.2.x' into 3.3.x 2020-05-14 17:48:18 +02:00
Marc Alexander
697e4963db
Merge pull request #5966 from 3D-I/ticket/16468
[ticket/16468] Amend DocBlocks for user_delete()
2020-05-14 17:48:10 +02:00
Marc Alexander
2328063b59
Merge branch '3.3.x' 2020-05-11 21:12:01 +02:00
Marc Alexander
7dd0c7296f
Merge pull request #5941 from mrgoldy/ticket/16426
[ticket/16426] Search results return characters as input box
2020-05-11 21:11:49 +02:00
Marc Alexander
de6cb282c1
Merge branch '3.3.x' 2020-05-11 21:04:58 +02:00
Marc Alexander
868bc3a069
Merge branch '3.2.x' into 3.3.x 2020-05-11 21:04:43 +02:00
Marc Alexander
bb43e732c8
Merge pull request #5939 from mrgoldy/ticket/16433
[ticket/16433] Add data array to core.ucp_register_user_row_after
2020-05-11 21:04:24 +02:00
ansavin
79ea63f164 [ticket/15591] Add jabber permission check
We want to make jabber address unvisible for those users who are not allowed
to send instant (jabber) messages.

PHPBB3-15591
2020-05-11 00:34:23 +03:00
3D-I
1b439cb6a0 [ticket/16468] Amend DocBlocks for user_delete()
PHPBB3-16468
2020-05-08 23:19:34 +02:00
mrgoldy
f958ea921c [ticket/15194] Group avatar delete
PHPBB3-15194
2020-05-08 22:09:30 +02:00
mrgoldy
7e41902db5 Merge branch '3.3.x' 2020-05-07 23:21:56 +02:00
mrgoldy
919597bfcf Merge branch '3.2.x' into 3.3.x 2020-05-07 23:21:51 +02:00
mrgoldy
7330cdee2c [ticket/15672] Readd config setting and correct HTML adjustment
PHPBB3-15672
2020-05-07 16:23:09 +02:00
ioannisbat
b8b6625872 [ticket/15672] Keep same format in Submit changes.
PHPBB3-15672
2020-05-07 16:14:51 +02:00
mrgoldy
82a20fed1c Merge branch '3.3.x' 2020-05-07 16:00:51 +02:00
mrgoldy
1b50650267 Merge branch '3.2.x' into 3.3.x 2020-05-07 15:59:41 +02:00
mrgoldy
6be65cb512 Merge pull request #5963 from dark-1/ticket/16463
[ticket/16463] Fix "acp_board.php" for "ACP_SUBMIT_CHANGES".
2020-05-07 15:56:01 +02:00
3D-I
7e60a3c075 [ticket/16468] Amend DocBlocks for user_delete()
PHPBB3-16468
2020-05-05 00:38:42 +02:00
mrgoldy
bde15d8539 Merge branch '3.3.x' 2020-05-04 22:51:05 +02:00
mrgoldy
9433ff449a Merge branch '3.2.x' into 3.3.x 2020-05-04 22:51:00 +02:00