37910 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	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	abd1db9451	Merge pull request #6694 from danieltj27/ticket/17373 ... [ticket/17373] Remove extra separator and change all separators to solid lines	2024-09-09 21:10:23 +02:00
Marc Alexander	0bdb2c701c	Merge branch '3.3.x'	2024-09-09 21:04:07 +02:00
Marc Alexander	9eb30b5d8e	Merge pull request #6712 from rxu/ticket/17387 ... [ticket/17387] Fix PHP warnings in search results	2024-09-09 21:04:04 +02:00
rxu	544e0900e6	[ticket/17387] Add more unicode tests ... PHPBB-17387	2024-09-03 00:16:05 +07:00
rxu	c26ded6025	[ticket/17387] Fix handling unicode strings ... PHPBB-17387	2024-09-02 23:24:24 +07:00
Daniel James	1c73b7ab19	[ticket/17390] Fix unset template variable for topic approval in mcp ... Fixes a bug that was introduced in 558b8ae whereby a template variable was added to wrap around the approve / disapprove UI however that variable was not set in mcp_queue so the check failed every time meaning you couldn't approve from the MCP. PHPBB-17390	2024-09-02 17:13:49 +01:00
Ruben Calvo	472b36877c	[ticket/17387] Add test for when words are separated by a non-space character ... PHPBB-17387	2024-09-02 14:38:50 +02:00
rxu	66b6a5e1f3	[ticket/17387] Make regex match unicode characters ... PHPBB-17387	2024-09-02 17:46:16 +07:00
rxu	8acba2db02	[ticket/17387] Return entire post text for zero or negative length value ... In according to 'Default number of returned characters' setting ACP explanation `A value of 0 will return the entire post`. Do the same for negative values too PHPBB-17387	2024-09-02 16:37:15 +07:00
Marc Alexander	da52e21ca1	Merge branch '3.3.x'	2024-09-01 20:05:44 +02:00
Marc Alexander	bf4e26a0b8	Merge pull request #6713 from rxu/ticket/17386-master ... [ticket/17386] Unify user based permissions test for 3.3.x and master branches	2024-09-01 20:05:41 +02:00
rxu	7c4b6cde8b	[ticket/17386] Fix user based permissions test ... PHPBB-17386	2024-09-02 00:19:20 +07:00
Marc Alexander	cbeeeee93f	Merge branch '3.3.x'	2024-09-01 16:51:08 +02:00