3821 Commits

Author	SHA1	Message	Date
Marc Alexander	39945aec10	Merge branch '3.2.x'	2018-01-19 12:20:57 +01:00
Marc Alexander	adc75b700f	Merge pull request #5083 from JoshyPHP/ticket/15512 ... [ticket/15512] Avoid reparsing non-existent polls	2018-01-19 12:20:54 +01:00
Marc Alexander	82ccc43767	Merge branch '3.2.x'	2018-01-17 23:06:19 +01:00
Jakub Senko	ad748ec0a7	[ticket/15099] Fix tests ... PHPBB3-15099	2018-01-17 22:10:53 +01:00
JoshyPHP	5878d66ebf	[ticket/15512] Avoid reparsing non-existent polls ... PHPBB3-15512	2018-01-12 16:28:37 +01:00
Derky	beed8821ff	Merge branch '3.2.x'	2018-01-11 21:03:20 +01:00
Marc Alexander	3c7f45c166	[ticket/15055] Fix line break and disable sql server 2017 for now ... SQL Server 2017 currently fails for unknown reasons and just results in an overall longer build time. Therefore disabling it for now. PHPBB3-15055	2018-01-09 21:22:58 +01:00
Marc Alexander	daf668a969	[ticket/15055] Display content on unexpted server error ... PHPBB3-15055	2018-01-08 21:17:38 +01:00
Marc Alexander	6b221ae4cb	Merge branch '3.2.x'	2018-01-07 19:30:41 +01:00
Marc Alexander	1b4bad6583	Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2	2018-01-07 11:02:31 +01:00
Marc Alexander	3ae0169542	Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2	2018-01-07 10:48:43 +01:00
Derky	7560ffcbe9	Merge branch '3.2.x'	2018-01-05 22:52:33 +01:00
Derky	182a96f273	Merge pull request #4680 from marc1706/ticket/15055 ... [ticket/15055] Add appveyor file to allow running tests on appveyor as well	2018-01-05 22:44:34 +01:00
Marc Alexander	7b6be23117	[ticket/15055] Use getMock() for phpBB 3.2 compatibility ... PHPBB3-15055	2018-01-01 19:25:11 +01:00
Marc Alexander	4afb53dd8d	[ticket/15055] Add comments explaining overriden createXMLDataSet() ... PHPBB3-15055	2018-01-01 18:57:56 +01:00
Marc Alexander	ee8b72d733	[ticket/15055] Properly support index length check on mssql ... PHPBB3-15055	2018-01-01 18:57:50 +01:00
Marc Alexander	a999718b42	[ticket/15055] Support console questions on windows ... PHPBB3-15055	2018-01-01 18:56:20 +01:00
Marc Alexander	ede339c1c8	[ticket/15055] Extend build matrix and trim text in extension_acp_test ... PHPBB3-15055	2018-01-01 18:56:13 +01:00
Marc Alexander	27a24d0a67	[ticket/15055] Try using build matrix ... PHPBB3-15055	2018-01-01 18:55:19 +01:00
Marc Alexander	400fc0f73d	[ticket/15055] Only drop dependent PK indexes and fix more tests for mssql ... PHPBB3-15055	2018-01-01 18:55:12 +01:00
Marc Alexander	f4381a20d4	[ticket/15055] Handle default identity column on mssql in database tests ... PHPBB3-15055	2018-01-01 18:55:06 +01:00
Marc Alexander	635befa00e	[ticket/15055] Drop primary keys when necessary and fix test comparisons ... PHPBB3-15055	2018-01-01 18:54:41 +01:00
Marc Alexander	f296014c23	[ticket/15055] Start fixing missing keys in fixtures ... PHPBB3-15055	2018-01-01 18:54:24 +01:00
Marc Alexander	66143e99be	[ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility ... PHPBB3-15055	2018-01-01 18:54:08 +01:00
Marc Alexander	4a2e203a80	[ticket/15055] Debug issues ... PHPBB3-15055	2018-01-01 18:53:57 +01:00
rxu	f8fbe37936	[ticket/14972] replace all occurrences of sizeof() with the count() ... PHPBB3-14972	2018-01-01 13:56:04 +01:00
rxu	11e09f1b3c	[ticket/14972] Fix test_collection_with_mask test ... In PHP 7.2, the severity of the message “Use of undefined constant” was raised from E_NOTICE to E_WARNING, so calling $array[ITEM] causes warning caught by error collector. Use undefined offset notice to get an empty message as such. PHPBB3-14972	2018-01-01 13:56:04 +01:00
rxu	6e6195c303	[ticket/14972] Avoid using self as constant in tests ... PHPBB3-14972	2018-01-01 13:56:03 +01:00
Marc Alexander	bf5f11e11a	Merge branch 'ticket/security/211' into ticket/security/211-rhea	2018-01-01 11:54:37 +01:00
Marc Alexander	f9da4f10ae	Merge pull request #5017 from Elsensee/ticket/15339-33 ... [ticket/15339] Use manual method when adding modules	2017-12-28 11:14:13 +01:00
Marc Alexander	d90680d685	Merge pull request #4971 from Elsensee/ticket/15339 ... [ticket/15339] Use manual method when adding modules	2017-12-28 10:50:55 +01:00
Marc Alexander	52cde712f2	Merge branch '3.2.x'	2017-12-27 18:39:20 +01:00
Marc Alexander	9d5c81ea7a	Merge pull request #5053 from JoshyPHP/ticket/15468 ... Add a service to merge duplicate BBCodes	2017-12-27 18:39:16 +01:00
Marc Alexander	1656ca4011	Merge branch '3.2.x'	2017-12-27 18:16:29 +01:00
Marc Alexander	9632294730	Merge pull request #5046 from JoshyPHP/ticket/15457 ... [ticket/15457] Updated s9e/text-formatter dependency	2017-12-27 18:11:18 +01:00
Oliver Schramm	1702219629	Merge branch 'ticket/15339' into ticket/15339-33	2017-12-24 19:55:46 +01:00
Oliver Schramm	2b16b7cada	[ticket/15339] Fix tests ... PHPBB3-15339	2017-12-24 19:55:03 +01:00
Marc Alexander	843586a93f	Merge branch '3.2.x'	2017-12-23 13:23:07 +01:00
Marc Alexander	cb233c862b	Merge pull request #5036 from JoshyPHP/ticket/15442 ... [ticket/15442] Allow unsafe HTML in bbcode.html	2017-12-23 13:23:01 +01:00
JoshyPHP	75e7e7b293	[ticket/15468] Add a service to merge duplicate BBCodes ... PHPBB3-15468	2017-12-10 02:57:07 +01:00
JoshyPHP	b9dce3fa65	[ticket/15457] Updated s9e/text-formatter dependency ... PHPBB3-15457	2017-12-10 02:55:10 +01:00
Marc Alexander	206c6b2185	Merge branch '3.2.x'	2017-11-26 18:33:59 +01:00
JoshyPHP	a7664811dd	[ticket/15464] Detect BBCodes in uppercase when reparsing ... PHPBB3-15464	2017-11-23 16:25:48 +01:00
Marc Alexander	c123254242	Merge branch '3.2.x'	2017-11-16 22:11:11 +01:00
Marc Alexander	0517e43dff	Merge pull request #4976 from rubencm/ticket/15171 ... [ticket/15171] Replace all BBCode templates by default	2017-11-16 21:56:57 +01:00
JoshyPHP	288def143c	[ticket/15442] Allow unsafe HTML in bbcode.html ... PHPBB3-15442	2017-11-07 10:34:11 +01:00
Marc Alexander	c309b4cd8d	Merge branch '3.2.x'	2017-11-01 18:02:14 +01:00
Marc Alexander	22e97296af	Merge pull request #5019 from marc1706/ticket/14994 ... [ticket/14994] Refactor template->assign_block_var	2017-11-01 17:23:33 +01:00
javiexin	bf882826e4	[ticket/14994] Refactor template->assign_block_var ... Refactor assign_block_var to use the same block selection mechanism as is used in alter_block_array. This allows creating new blocks at any position in the template structure, not only on the last block. Allows selecting a block as outer[2].middle. Added tests. PHPBB3-14994	2017-11-01 12:29:47 +01:00
Marc Alexander	e157d8890b	Merge pull request #5020 from marc1706/ticket/15424 ... [ticket/15424] Multiple typo fixes in docs & comments	2017-11-01 12:27:13 +01:00