Commit graph

38383 commits

Author SHA1 Message Date
Daniel James
501ecf5dec [ticket/17382] Update FAQ string with new suggestion
PHPBB-17382
2024-09-29 23:38:09 +01:00
Marc Alexander
94112979a0
Merge pull request #6702 from marc1706/ticket/16777
[ticket/16777] Remove remainders of max image size
2024-09-29 20:47:40 +02:00
Marc Alexander
8de32341e2
Merge branch '3.3.x' 2024-09-29 20:40:43 +02:00
Marc Alexander
13b267ca6f
Merge pull request #6715 from marc1706/ticket/17385
[ticket/17385] Backport file_downloader with guzzle for versioncheck with redirect support
2024-09-29 19:57:33 +02:00
Marc Alexander
d25e5f6360 Merge branch '3.3.x' 2024-09-29 17:29:56 +00:00
Marc Alexander
6db142b8ef
Merge pull request #6705 from rxu/ticket/17383
[ticket/17383] Fix HELO/EHLO error in email messenger on PHP8
2024-09-29 19:29:37 +02:00
Marc Alexander
ca0c784a8c
Merge pull request #6724 from marc1706/ticket/17403
[ticket/17403] Update composer and node dependencies
2024-09-29 14:56:06 +02:00
Marc Alexander
864e695deb Merge branch '3.3.x' 2024-09-29 09:58:30 +00:00
rxu
4ba4b94fe0
[ticket/17402] Add precaution
PHPBB-17402
2024-09-29 16:42:28 +07:00
Marc Alexander
071a91ac85
Merge pull request #6721 from marc1706/ticket/17400
[ticket/17400] Use fixed version for mssql 2017 tests
2024-09-29 11:30:13 +02:00
Marc Alexander
7c95839951
Merge pull request #6725 from iMattPro/ticket/17404
[ticket/17404] Update workflow test badges
2024-09-29 11:26:09 +02:00
Marc Alexander
65794eb96f Merge branch '3.3.x' 2024-09-29 09:14:18 +00:00
Marc Alexander
cd619d350b
Merge pull request #6727 from marc1706/ticket/17396
[ticket/17396] Use GitHub App to merge to master
2024-09-29 11:13:59 +02:00
Marc Alexander
fe4d8bfa7e
[ticket/17396] Use GitHub App to merge to master
[skip actions] Due to no code changes that run in PRs.

PHPBB-17396
2024-09-29 11:09:46 +02:00
Marc Alexander
6c2d68962f
Merge branch '3.3.x' 2024-09-29 09:38:15 +02:00
Marc Alexander
283b4f8171
Merge pull request #6726 from rxu/ticket/17405
[ticket/17405] Fix getting UTC date/time information logic
2024-09-29 09:38:13 +02:00
rxu
990cbe093b
[ticket/17405] Fix getting UTC date/time information logic
PHPBB-17405
2024-09-29 01:57:53 +07:00
Matt Friedman
80957d12eb
[ticket/17404] Update workflow test badges
PHPBB-17404

Signed-off-by: Matt Friedman <maf675@gmail.com>
2024-09-28 09:26:04 -07:00
Marc Alexander
9938613d42
Merge branch '3.3.x' 2024-09-28 16:52:14 +01:00
Marc Alexander
d8dc1204c2
Merge pull request #6723 from marc1706/ticket/17394
[ticket/17394] Merge local 3.3.x and not remote into master
2024-09-28 16:52:12 +01:00
Marc Alexander
724ecdcdba
[ticket/17403] Update node packages
PHPBB-17403
2024-09-28 16:32:34 +01:00
Marc Alexander
56f8b08ec2
[ticket/17403] Update composer depdencies and twig
PHPBB-17403
2024-09-28 16:29:55 +01:00
Marc Alexander
d5e94f1d97
[ticket/17394] Merge local 3.3.x and not remote into master
PHPBB-17394
2024-09-28 16:14:22 +01:00
Marc Alexander
9ace4dc585
[ticket/17385] Change default value in docblock
PHPBB-17385
2024-09-28 16:01:02 +01:00
rxu
2ac9c0ae7c
[ticket/17402] Add CLI reparser option to force reparsing BBCode
PHPBB-17402
2024-09-28 21:47:09 +07:00
Marc Alexander
e21d7be3d3
Merge branch '3.3.x' 2024-09-28 15:28:11 +01:00
Marc Alexander
5229152604
[ticket/17400] Use ubuntu 20.04 until microsoft fixes their container
PHPBB-17400
2024-09-28 15:23:35 +01:00
Marc Alexander
914383a581
Merge pull request #6714 from danieltj27/ticket/17390
[ticket/17390] Fix unset template variable for topic approval in mcp
2024-09-25 16:12:07 +01:00
Marc Alexander
f628e4f0b4
Merge pull request #6714 from danieltj27/ticket/17390
[ticket/17390] Fix unset template variable for topic approval in mcp
2024-09-25 17:08:39 +02:00
Marc Alexander
96df4d1284
Merge pull request #6664 from rubencm/ticket/17357
[ticket/17357] Remove file_info from storage
2024-09-25 17:07:04 +02:00
Marc Alexander
a23fb62817
Merge branch '3.3.x' 2024-09-25 15:21:07 +01:00
Marc Alexander
45a43e85d8
Merge pull request #6720 from marc1706/ticket/17396
[ticket/17396] Fetch full history and branch 3.3.x if merging to master
2024-09-25 16:14:45 +02:00
Marc Alexander
08d184b0fa
[ticket/17396] Try running other-tests on ubuntu-20.04
PHPBB-17396
2024-09-25 14:34:54 +01:00
Marc Alexander
d6a17c1fe7
[ticket/17396] Fetch full history and branch 3.3.x if merging to master
PHPBB-17396
2024-09-19 20:48:21 +02:00
Marc Alexander
ba03a05d27
Merge pull request #6718 from marc1706/ticket/17396
[ticket/17396] Only try pushing if merge was successful
2024-09-18 22:31:45 +02:00
Marc Alexander
17d066a980
[ticket/17396] Only try pushing if merge was successful
PHPBB-17396
2024-09-18 20:41:03 +02:00
Marc Alexander
df5c769b55
Merge branch '3.3.x' 2024-09-18 20:33:25 +02:00
Marc Alexander
b574a0294c
Merge pull request #6717 from marc1706/ticket/17396
[ticket/17396] Add workflow for merging 3.3.x into master
2024-09-18 20:29:43 +02:00
Marc Alexander
4fb06b00b7
[ticket/17396] Adjust merge code
PHPBB-17396
2024-09-17 22:10:28 +02:00
Marc Alexander
3d70d87b57
[ticket/17396] Split merge check to master to separate yml file
PHPBB-17396
2024-09-17 21:46:03 +02:00
Marc Alexander
f55d747bb4
[ticket/17396] Add workflow for merging 3.3.x into master
PHPBB-17396
2024-09-17 20:38:14 +02:00
Marc Alexander
db18f54234
Merge branch '3.3.x' 2024-09-17 20:28:47 +02:00
Marc Alexander
c5f13dd327
Merge pull request #6716 from marc1706/ticket/17394
[ticket/17394] Check mergeability of 3.3.x PRs
2024-09-17 20:26:46 +02:00
Marc Alexander
e406308244
[ticket/17394] Specify pull_request_target types
PHPBB-17394
2024-09-16 21:38:39 +02:00
Marc Alexander
15556319d9
[ticket/17394] Try using pull_request_target event
PHPBB-17394
2024-09-16 20:13:16 +02:00
Marc Alexander
7a21119d17
[ticket/17394] Check mergeability of 3.3.x PRs
PHPBB-17394
2024-09-15 20:34:25 +02:00
Marc Alexander
5a09105c3c
[ticket/17385] Backport tests for updated file downloader to 3.3.x
PHPBB-17385
2024-09-10 22:04:55 +02:00
Marc Alexander
48c2ca9dfe
[ticket/12479] Add missing file fixture
PHPBB-12479
2024-09-10 22:01:29 +02:00
Marc Alexander
d6ed21f3f2
[ticket/12479] Use separate mock in "remote" file test
PHPBB-12479
2024-09-10 22:01:14 +02:00
Marc Alexander
929013388f
[ticket/12479] Fix use statements in file_downloader
PHPBB-12479
2024-09-10 22:00:58 +02:00