34002 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matt Friedman	7268859226	[ticket/17510] Fix Code Sniffer deprecations ... PHPBB-17510	2025-05-13 18:03:10 -07: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	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	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	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	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	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	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	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	7f08efb04c	Merge pull request #6709 from rxu/ticket/17386 ... [ticket/17386] Fix resulting permission for user-based tracing	2024-09-01 16:51:05 +02:00
Marc Alexander	6ca926c146	Merge pull request #6665 from rxu/ticket/17359 ... [ticket/17359] Distinct disabled and available extensions list	2024-09-01 16:44:43 +02:00
rxu	a7b673a1b6	[ticket/17387] Fix PHP warnings in search results ... PHPBB-17387	2024-08-31 23:23:10 +07:00
rxu	03f315f7b7	[ticket/17386] Add test ... PHPBB-17386	2024-08-31 22:15:03 +07:00
rxu	76752800c2	[ticket/17386] Fix resulting permission for user-based tracing ... PHPBB-17386	2024-08-31 22:14:52 +07:00
Marc Alexander	23f872d138	Merge pull request #6710 from marc1706/ticket/17384 ... [ticket/17384] Stop overriding error handler in test case	2024-08-31 15:30:38 +02:00
Marc Alexander	92730af7a4	[ticket/17384] Stop overriding error handler in test case ... PHPBB-17384	2024-08-31 08:59:57 +02:00
Marc Alexander	80f4c07bc5	Merge pull request #6695 from battye/ticket/17181 ... [ticket/17181] Remove unused PM report code	2024-08-30 11:42:02 +02:00
Marc Alexander	dc0561c8bf	Merge pull request #6706 from rxu/ticket/17384 ... [ticket/17384] Handle E_USER_ERROR for PHP 8.4 tests - 3.3.x	2024-08-30 11:12:40 +02:00
Marc Alexander	9c9dcb1e35	Merge branch 'prep-release-3.3.13' into 3.3.x	2024-08-29 20:34:46 +02:00
Marc Alexander	b083e223e2	[prep-release-3.3.13] Update changelog for 3.3.13	2024-08-28 20:18:39 +02:00
Marc Alexander	88243d296c	[prep-release-3.3.13] Add migration for 3.3.13	2024-08-28 20:12:25 +02:00
Marc Alexander	53c60419b4	[prep-release-3.3.13] Update version numbers to 3.3.13	2024-08-28 20:09:41 +02:00
rxu	45515b7072	[ticket/17384] Handle E_USER_ERROR for PHP 8.4 tests ... PHPBB-17384	2024-08-18 18:15:52 +07:00
rxu	629a909b65	[ticket/17359] Adjust template event target phpBB version ... PHPBB-17359	2024-08-13 15:33:18 +07:00
Marc Alexander	9d64579dea	Merge branch 'prep-release-3.3.13' into 3.3.x	2024-08-06 22:11:16 +02:00
Marc Alexander	092f583422	Merge pull request #6700 from marc1706/ticket/17377 ... [ticket/17377] Use specific mssql docker images to have uniform builds	2024-08-06 22:10:49 +02:00
Marc Alexander	8b7f215309	[ticket/17377] Use specific mssql docker images to have uniform builds ... PHPBB-17377	2024-08-06 21:08:10 +02:00
Marc Alexander	31f0e7b882	[3.3.x] Update versions to 3.3.14-dev	2024-08-05 20:30:55 +02:00
Marc Alexander	ee3b351419	Merge branch 'prep-release-3.3.13' into 3.3.x	2024-08-05 20:29:22 +02:00
Marc Alexander	2973c2f6db	[prep-release-3.3.13] Update changelog for 3.3.13-RC1	2024-08-02 19:22:23 +02:00
Marc Alexander	57ef18ecc0	[prep-release-3.3.13] Update stylesheet hashes for 3.3.13-RC1	2024-08-02 19:20:35 +02:00
Marc Alexander	e9e305ee9f	[prep-release-3.3.13] Add migration for 3.3.13-RC1	2024-08-02 19:20:35 +02:00
Marc Alexander	1d256fef61	[prep-release-3.3.13] Update version numbers to 3.3.13	2024-08-02 19:20:32 +02:00