3617 Commits

Author	SHA1	Message	Date
Tristan Darricau	007bb90e05	Merge branch '3.2.x' ... * 3.2.x: [ticket/15036] Unlink install_config during functional testing	2017-01-22 23:30:25 +01:00
Tristan Darricau	cf6a4738b1	Merge pull request #4659 from marc1706/ticket/15036 ... [ticket/15036] Unlink install_config during functional testing * marc1706/ticket/15036: [ticket/15036] Unlink install_config during functional testing	2017-01-22 23:30:22 +01:00
Tristan Darricau	7f82d28f6f	Merge branch '3.2.x' ... * 3.2.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch	2017-01-22 23:16:23 +01:00
Tristan Darricau	7c77e33313	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch	2017-01-22 23:15:26 +01:00
Marc Alexander	574dac7667	Merge branch '3.2.x'	2017-01-22 23:02:47 +01:00
JoshyPHP	9aa8dc26b7	[ticket/14790] Added test case ... PHPBB3-14790	2017-01-22 19:19:12 +01:00
Marc Alexander	38d0f2892e	[ticket/14968] Use earlier version as written in comment ... PHPBB3-14968	2017-01-22 17:01:12 +01:00
Marc Alexander	20a4d095de	[ticket/14968] Update docblock and ensure method returns array ... PHPBB3-14968	2017-01-22 16:58:37 +01:00
Marc Alexander	0572d6e33a	[ticket/14968] Add method for retrieving updates on current branch ... PHPBB3-14968	2017-01-22 16:09:51 +01:00
Marc Alexander	4b2a5a41a7	[ticket/15036] Unlink install_config during functional testing ... PHPBB3-15036	2017-01-21 10:28:08 +01:00
Marc Alexander	7973984821	Merge branch '3.2.x'	2017-01-15 14:06:13 +01:00
Marc Alexander	e64072e01f	Merge pull request #4648 from JoshyPHP/ticket/15016 ... [ticket/15016] Fixed an issue with some parentheses in smilies	2017-01-15 13:55:55 +01:00
Tristan Darricau	51500977b2	Merge branch '3.2.x' ... * 3.2.x: [ticket/14989] Allow more admin-configurable schemes in post links	2017-01-15 12:36:29 +01:00
Tristan Darricau	4fd6b0fd88	Merge pull request #4632 from VSEphpbb/ticket/14989 ... [ticket/14989] Allow more admin-configurable schemes in post links * VSEphpbb/ticket/14989: [ticket/14989] Allow more admin-configurable schemes in post links	2017-01-15 12:36:26 +01:00
Tristan Darricau	6fe1605137	Merge branch '3.2.x' ... * 3.2.x: [ticket/14985] Added functional tests for BBCodes and smilies [ticket/14985] Decode HTML special chars in plain text columns	2017-01-15 12:08:06 +01:00
Tristan Darricau	2637606ae1	Merge pull request #4631 from JoshyPHP/ticket/14985 ... [ticket/14985] Decode HTML special chars in plain text columns * JoshyPHP/ticket/14985: [ticket/14985] Added functional tests for BBCodes and smilies [ticket/14985] Decode HTML special chars in plain text columns	2017-01-15 12:08:01 +01:00
JoshyPHP	52d53ef3de	[ticket/15016] Fixed an issue with some parentheses in smilies ... PHPBB3-15016	2017-01-15 11:24:15 +01:00
Marc Alexander	d882911bf5	Merge branch '3.2.x'	2017-01-15 00:25:32 +01:00
JoshyPHP	15315ac87a	[ticket/15008] Disable emoji when smilies are disabled ... Will effectively disable emoji shortname and won't replace emoji with images but will not prevent a browser or OS from displaying emoji as images. PHPBB3-15008	2017-01-14 14:27:38 +01:00
JoshyPHP	499fcbcca9	[ticket/14985] Added functional tests for BBCodes and smilies ... PHPBB3-14985	2017-01-12 09:30:58 +01:00
Matt Friedman	a3accfaf46	[ticket/14989] Allow more admin-configurable schemes in post links ... PHPBB3-14989	2017-01-11 01:55:39 -08:00
Tristan Darricau	fb5f33f190	Merge branch '3.2.x' ... * 3.2.x: [ticket/14971] Add on_page test with the string arguments [ticket/14971] Fix pagination PHP warning on PHP 7.1	2017-01-08 18:35:29 +01:00
rxu	06b402bdec	[ticket/14971] Add on_page test with the string arguments ... PHPBB3-14971	2017-01-08 23:09:36 +07:00
Marc Alexander	c0fb367d0a	Merge branch '3.2.x'	2017-01-07 00:16:49 +01:00
Marc Alexander	7074876f32	Merge pull request #4619 from Nicofuma/ticket/14962 ... [ticket/14962] Introduces a new helper to check emptyness of bbcode texts	2017-01-07 00:16:45 +01:00
Marc Alexander	538f03efb0	[ticket/14962] Fix functional test for editing post ... PHPBB3-14962	2017-01-06 23:46:34 +01:00
Tristan Darricau	f82299b8e4	[ticket/14962] Introduces a new helper to check emptyness of bbcode texts ... PHPBB3-14962	2017-01-06 21:40:31 +01:00
Marc Alexander	ee3cf0af0f	Merge branch '3.2.x'	2017-01-04 21:07:36 +01:00
Marc Alexander	24b02ad4d6	Merge pull request #4443 from Crizz0/ticket/14780 ... [ticket/14780] Correction to let group setting overwrite global PM setting	2017-01-04 21:07:32 +01:00
Marc Alexander	ac1bf79904	Merge branch '3.2.x'	2017-01-04 20:12:03 +01:00
Marc Alexander	b582a19039	[ticket/14838] Correctly instantiate language object ... PHPBB3-14838	2017-01-04 19:47:10 +01:00
Marc Alexander	1db7aa712a	[ticket/14838] Add missing method to mock'ed feed ... PHPBB3-14838	2017-01-04 19:19:02 +01:00
Marc Alexander	e5cc7b6631	Merge branch '3.2.x'	2017-01-04 17:44:15 +01:00
Marc Alexander	03be94c1f7	Merge branch '3.1.x' into 3.2.x	2017-01-04 17:44:11 +01:00
Marc Alexander	3d93fd40ed	Merge pull request #4611 from marc1706/ticket/14838 ... [icket/14838] Do not query full attachments table in feeds	2017-01-04 17:44:07 +01:00
Marc Alexander	5c2b9e0e37	Merge branch '3.2.x'	2017-01-04 17:30:05 +01:00
Marc Alexander	c0882c1d34	[ticket/14838] Add simple test for fetch_attachments method ... PHPBB3-14838	2017-01-03 22:57:14 +01:00
Marc Alexander	9f149e345b	Merge branch 'ticket/14957' into ticket/14957-rhea	2017-01-03 22:22:46 +01:00
Marc Alexander	072bf470fc	Merge branch 'ticket/14957' into ticket/14957-rhea	2017-01-03 21:41:36 +01:00
Marc Alexander	14fd750b08	[ticket/14957] Do not cache database config entries ... PHPBB3-14957	2017-01-03 21:29:30 +01:00
Marc Alexander	b5ad21debc	Merge branch '3.2.x'	2017-01-02 22:55:25 +01:00
Marc Alexander	429225027e	[ticket/14947] Create new webdriver instance for every test ... PHPUnit seems to have emptied the webdriver between every test, which causes curl errors. A new webdriver instance will now be created for every test file. This does not cause a lot of overhead for ui tests. PHPBB3-14947	2017-01-02 20:39:41 +01:00
Tristan Darricau	5ff0e4ec7d	Merge branch '3.2.x'	2016-12-29 18:27:59 +01:00
JoshyPHP	f111e70fc3	[ticket/14914] Made emoji scale in size with text ... PHPBB3-14914	2016-12-27 21:48:01 +01:00
Marc Alexander	1f7c2afbab	Merge branch '3.2.x'	2016-12-18 20:40:51 +01:00
Marc Alexander	d3fb01d8f7	Merge branch '3.1.x' into 3.2.x	2016-12-18 20:40:46 +01:00
Crizzo	71f82f2615	[ticket/14770] Decreases quality to 85, changes test to 85, too ... PHPBB3-14770	2016-12-18 15:31:58 +01:00
Marc Alexander	3848c7e8e6	Merge branch '3.2.x'	2016-12-18 10:44:21 +01:00
Marc Alexander	de6942e117	[ticket/14921] Use phpbb.com URL to prevent test failures for remote URLs ... PHPBB3-14921	2016-12-17 23:29:19 +01:00
Tristan Darricau	58734f960d	Merge branch '3.2.x' ... * 3.2.x: [ticket/14895] Fix broken tests [ticket/14895] Fix issues in CLI classes [ticket/14895] Use SymfonyStyle in all CLI [ticket/14895] Use SymfonyIO styling [ticket/14895] CLI reparser:list should display proper list	2016-12-11 20:25:12 +01:00