1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 00:21:02 +01:00

34387 Commits

Author SHA1 Message Date
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
Marc Alexander
cb8d9be8b6
Merge branch '3.3.x' 2020-05-17 17:01:14 +02:00
Marc Alexander
ec66a42664
Merge branch '3.2.x' into 3.3.x 2020-05-17 17:01:04 +02:00
Marc Alexander
3bfeacaa88
Merge pull request #5973 from mrgoldy/ticket/16437
[ticket/16437] Display forum permissions
2020-05-17 17:00:48 +02:00
Marc Alexander
f7c217bf86
Merge pull request #5974 from mrgoldy/ticket/16473
[ticket/16473] Correct filename for clean_error_exception
2020-05-17 16:49:44 +02:00
Marc Alexander
310fdf5112
Merge branch '3.3.x' 2020-05-17 16:48:25 +02:00
Marc Alexander
ec49bd2d69
Merge pull request #5975 from rxu/ticket/16476
[ticket/16476] Eliminate links to deleted background images in tweaks.css
2020-05-17 16:42:39 +02:00
Marc Alexander
cbab3e17a2
Merge branch '3.3.x' 2020-05-14 21:15:12 +02:00
Marc Alexander
466abd7a3d
Merge pull request #5976 from rxu/ticket/16474
[ticket/16474] Hide vertical scrollbar for attachbox
2020-05-14 21:13:47 +02:00
Marc Alexander
2fe749fd9a
Merge branch '3.3.x' 2020-05-14 20:58:39 +02:00
Marc Alexander
02253134c9
Merge pull request #5980 from rxu/ticket/16478
[ticket/16478] Fix phpBB Debug warning in installer
2020-05-14 20:58:25 +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
9368d2ea8a
Merge branch '3.3.x' 2020-05-14 17:44:31 +02:00
Marc Alexander
c5d83ef715
Merge branch '3.2.x' into 3.3.x 2020-05-14 17:44:22 +02:00
Marc Alexander
1c3585f575
Merge pull request #5920 from mrgoldy/ticket/13867
[ticket/13867] Manage new profile field types
2020-05-14 17:44:06 +02:00
rxu
09e308a06d
[ticket/16478] Fix phpBB Debug warning in installer
PHPBB3-16478
2020-05-13 13:38:13 +07:00
rxu
fabe9ce56b
[ticket/16474] Hide vertical scrollbar for attachbox
PHPBB3-16474
2020-05-12 19:34:07 +07:00
rxu
1f8149706c
[ticket/16476] Eliminate links to deleted background images in tweaks.css
PHPBB3-16476
2020-05-12 18:27:46 +07: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
Marc Alexander
ac2b8f2674
Merge branch '3.3.x' 2020-05-10 23:15:01 +02:00
Marc Alexander
1169e1915d
Merge pull request #5940 from mrgoldy/ticket/16434
[ticket/16434] Add forum id to advanced search in viewforum
2020-05-10 23:14:51 +02:00
mrgoldy
34cb12b8a7 [ticket/16473] Correct filename for clean_error_exception
PHPBB3-16473
2020-05-09 00:49:10 +02:00
3D-I
1b439cb6a0 [ticket/16468] Amend DocBlocks for user_delete()
PHPBB3-16468
2020-05-08 23:19:34 +02:00
mrgoldy
61e263ba8d [ticket/16437] Display forum permissions
PHPBB3-16437
2020-05-08 22:55:21 +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
8a8403ff8a Merge pull request #5228 from ioannisbat/ticket/15672
[ticket/15672] Keep same format in Submit changes.
2020-05-07 23:21:45 +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
209c72a97b Merge branch '3.3.x' 2020-05-04 22:53:34 +02:00
mrgoldy
cb0583df1d Merge branch '3.2.x' into 3.3.x 2020-05-04 22:53:29 +02:00
mrgoldy
56ddf5827f Merge pull request #5960 from rxu/ticket/16458
[ticket/16458] Add template events to acp_profile.html
2020-05-04 22:53:24 +02:00
mrgoldy
bde15d8539 Merge branch '3.3.x' 2020-05-04 22:51:05 +02:00