Commit graph

37798 commits

Author SHA1 Message Date
Marc Alexander
189072f69d
Merge branch '3.3.x' 2024-07-28 21:02:15 +02:00
Marc Alexander
4038bb9dc3
Merge pull request #6691 from marc1706/ticket/13933
[ticket/13933] Extend tokens' definitions in ACP bbcodes
2024-07-28 21:02:11 +02:00
Marc Alexander
f142f07f46
Merge pull request #6682 from marc1706/ticket/16213-master
[ticket/16213] Add .htaccess for phpbb and vendor folders -- master version
2024-07-28 20:56:10 +02:00
Marc Alexander
6747c4e62a
Merge branch '3.3.x' 2024-07-28 20:47:17 +02:00
Marc Alexander
935c1a3ea2
Merge pull request #6680 from marc1706/ticket/17366
[ticket/17366] Resolve issues with form submissions and recaptcha
2024-07-28 20:47:14 +02:00
Marc Alexander
d7d238caeb
Merge branch '3.3.x' 2024-07-28 20:44:59 +02:00
Marc Alexander
6eb49d0907
Merge pull request #6681 from marc1706/ticket/16213
[ticket/16213] Add .htaccess for phpbb and vendor folders
2024-07-28 20:44:56 +02:00
Marc Alexander
623bd9f3f4
Merge branch '3.3.x' 2024-07-28 20:43:23 +02:00
Marc Alexander
7fe0cc7f26
Merge pull request #6686 from marc1706/ticket/15576
[ticket/15576] Handle subject max length same as in form input
2024-07-28 20:43:20 +02:00
Marc Alexander
54e6eccedd
Merge branch '3.3.x' 2024-07-28 20:37:36 +02:00
Marc Alexander
28cf33eb2f
Merge pull request #6688 from marc1706/ticket/14454
[ticket/14454] Handle special case of testing user permissions in ACP modules
2024-07-28 20:37:34 +02:00
Marc Alexander
09b5d6605e
Merge branch '3.3.x' 2024-07-28 20:35:52 +02:00
Marc Alexander
cf47bed67e
Merge pull request #6689 from marc1706/ticket/17370
[ticket/17370] Move delete cookies functionality to controller
2024-07-28 20:35:42 +02:00
Marc Alexander
21b90bdeff
Merge branch '3.3.x' 2024-07-28 20:32:05 +02:00
Marc Alexander
1e28669407
Merge pull request #6696 from marc1706/ticket/17374
[ticket/17374] Only delete marked logs if entries have been marked
2024-07-28 20:31:52 +02:00
Marc Alexander
1444a1a02b
Merge pull request #6697 from marc1706/ticket/17022
[ticket/17022] Fix SQL report link
2024-07-27 08:10:32 +02:00
Marc Alexander
a7720522a2
[ticket/17022] Fix SQL report link
PHPBB-17022
2024-07-26 20:37:36 +02:00
Marc Alexander
2afb6bd8cd
Merge pull request #6687 from marc1706/ticket/12479
[ticket/12479] Remove deprecated functions
2024-07-24 22:45:53 +02:00
Marc Alexander
c36c6a2308
[ticket/12479] Use fixed mssql docker version until Microsoft learns testing
PHPBB-12479
2024-07-24 21:29:35 +02:00
Marc Alexander
c6b40259f7
[ticket/12479] Add missing file fixture
PHPBB-12479
2024-07-24 19:13:06 +02:00
Marc Alexander
ca56181008
[ticket/12479] Use separate mock in "remote" file test
PHPBB-12479
2024-07-23 21:25:22 +02:00
Marc Alexander
efff5ac49e
[ticket/12479] Fix use statements in file_downloader
PHPBB-12479
2024-07-23 21:06:48 +02:00
Marc Alexander
445a16be93
[ticket/12479] Remove dns check from test as we don't test against host anymore
PHPBB-12479
2024-07-23 21:05:54 +02:00
Marc Alexander
02c59fdf43
[ticket/12479] Convert file_downloader to use guzzle instead of fsockopen
PHPBB-12479
2024-07-23 21:04:34 +02:00
Marc Alexander
58cc1f4ef3
[ticket/17374] Only delete marked logs if entries have been marked
PHPBB-17374
2024-07-23 20:18:28 +02:00
Marc Alexander
8b3bc0b5f5
[ticket/12479] Remove duplicate semi-colons
PHPBB-12479
2024-07-17 18:06:22 +02:00
Marc Alexander
132bd6cdb5
Merge branch '3.3.x' 2024-07-16 21:04:12 +02:00
Marc Alexander
704453b5d1
Merge pull request #6670 from marc1706/ticket/17353-master
[ticket/17353] Get gravatar img src and fix incorrect treatment of height -- master version
2024-07-16 21:04:07 +02:00
Marc Alexander
45d64a1627
Merge pull request #6660 from marc1706/ticket/17353
[ticket/17353] Get gravatar img src and fix incorrect treatment of height
2024-07-16 21:03:44 +02:00
Marc Alexander
10f92dbb68
[ticket/13933] Extend tokens' definitions in ACP bbcodes
PHPBB-13933
2024-07-16 21:01:57 +02:00
Marc Alexander
f3e852a20c
Merge branch '3.3.x' 2024-07-15 19:50:40 +02:00
Marc Alexander
651723d6e6
Merge pull request #6690 from rubencm/ticket/15043-master
[ticket/15043] Rewrite get_context() [master version]
2024-07-15 19:50:34 +02:00
Marc Alexander
bc7bd15312
Merge pull request #5385 from rubencm/ticket/15043
[ticket/15043] Rewrite get_context()
2024-07-15 19:49:59 +02:00
Ruben Calvo
5c40766dc4
[ticket/15403] Remove last element of array only if needed
PHPBB-15403
2024-07-15 12:30:40 +02:00
Ruben Calvo
06ff814f04
[ticket/15403] Remove last element of array only if needed
PHPBB-15403
2024-07-15 12:30:10 +02:00
Ruben Calvo
d679ac4df8
[ticket/15403] Remove suggestion from composer.json
PHPBB-15403
2024-07-14 23:54:01 +02:00
Ruben Calvo
2818ca1309
[ticket/15403] Add another test
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
6b5a632c12
[ticket/15403] Handle ellipsis at the beginning of context and add tests
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
ec8bbf3da3
[ticket/15403] Use substr over the fragment and not the whole text
PHPBB-15403
2024-07-14 22:00:26 +02:00
Ruben Calvo
5f0e639b83
[ticket/15403] Refactor get_context
PHPBB-15403
2024-07-14 22:00:25 +02:00
Marc Alexander
7181b05e38
[ticket/15043] Small code cleanup
PHPBB-15043
2024-07-14 21:59:51 +02:00
Marc Alexander
67ad543135
[ticket/15043] Add unit test for get_context
PHPBB-15043
2024-07-14 21:59:51 +02:00
Ruben Calvo
95b8b50599
[ticket/15403] Return first fragment of text if there is no coincidences
PHPBB-15403
2024-07-14 21:59:51 +02:00
Ruben Calvo
68436c4a96
[ticket/15403] Fix order of parameters in implode
PHPBB-15403
2024-07-14 21:59:51 +02:00
Rubén Calvo
02321c412c
[ticket/15043] Update regexp
PHPBB3-15043
2024-07-14 21:59:51 +02:00
Rubén Calvo
13f7a8f82f
[ticket/15043] New get_context displays more text
PHPBB3-15043
2024-07-14 21:59:51 +02:00
Rubén Calvo
2f3183796c
[ticket/15043] Rewrite get_context()
PHPBB3-15043
2024-07-14 21:59:50 +02:00
Marc Alexander
661140c50b
[ticket/17370] Redirect from UCP to delete cookies controller
PHPBB-17370
2024-07-14 20:44:01 +02:00
Marc Alexander
294c517256
[ticket/17370] Add controller for deleting cookies
PHPBB-17370
2024-07-14 20:42:03 +02:00
Marc Alexander
508d864fcd
Merge branch '3.3.x' 2024-07-14 14:46:23 +02:00