3654 Commits

Author	SHA1	Message	Date
Marc Alexander	c92c2aa2f4	Merge branch '3.2.x'	2017-04-16 11:42:53 +02:00
Marc Alexander	d44d1f115f	Merge pull request #4698 from javiexin/ticket/15087 ... [ticket/15087] Optimize creation of metadata objects by caching	2017-04-16 11:15:45 +02:00
Marc Alexander	58929bdccd	Merge branch '3.2.x'	2017-04-15 18:19:16 +02:00
Marc Alexander	269150ed40	Merge pull request #4612 from javiexin/ticket/14950 ... [ticket/14950] Add possibility to delete a template block	2017-04-15 18:18:32 +02:00
Marc Alexander	fba8595421	Merge branch '3.2.x'	2017-04-11 21:28:08 +02:00
Matt Friedman	6ce5ef53cb	[ticket/15142] Merge branch 'ticket/15142' into 32x ... PHPBB3-15142	2017-04-10 15:51:22 -07:00
Matt Friedman	74054317d2	[ticket/15142] Add ext branch update tests ... PHPBB3-15142	2017-03-24 11:47:28 -07:00
Marc Alexander	37ee22a0e6	Merge branch '3.2.x'	2017-03-08 21:09:40 +01:00
Marc Alexander	e0d31d8897	Merge pull request #4714 from vinny/ticket/14732 ... [ticket/14732] Remove PHP Code syntax highlighting references	2017-03-08 21:07:47 +01:00
Vinny	51a55cee5d	[ticket/14732] Remove references from tests ... PHPBB3-14732	2017-02-28 05:59:22 -03:00
Marc Alexander	967817143d	Merge branch '3.2.x'	2017-02-23 22:21:25 +01:00
Marc Alexander	7a1f4d5008	Merge branch '3.1.x' into 3.2.x	2017-02-23 22:21:20 +01:00
Marc Alexander	9267235f30	Merge pull request #4605 from javiexin/ticket/14943 ... [ticket/14943] Fix template loop access by index	2017-02-23 22:21:16 +01:00
Marc Alexander	e24d3a6ade	Merge branch '3.2.x'	2017-02-19 21:47:10 +01:00
Marc Alexander	bdaa6e4909	Merge branch '3.1.x' into 3.2.x	2017-02-19 21:47:06 +01:00
Marc Alexander	481a592b8d	Merge pull request #4598 from javiexin/ticket/14944 ... [ticket/14944] Add search for template loop indexes by key	2017-02-19 21:47:00 +01:00
javiexin	7000db3049	[ticket/15087] Optimize creation of metadata objects by caching ... Fix constructor in test cases. PHPBB3-15087	2017-02-12 19:25:42 +01:00
Marc Alexander	30c8e40b9b	Merge branch '3.2.x'	2017-02-11 21:48:42 +01:00
Marc Alexander	f27cdad73e	Merge branch '3.1.x' into 3.2.x	2017-02-11 21:48:20 +01:00
Marc Alexander	45199adebd	Merge pull request #4523 from senky/ticket/13429 ... [ticket/13429] Replace @change with @changed in event docblocks	2017-02-11 15:19:47 +01:00
javiexin	849fd9df7d	[ticket/14944] Add possibility to search for template loop indexes by key ... Adds a new function to the template interface, and implements it in the context class. The function returns the ordinal index for a specified key, with the same structure that the key for alter_block_array. Reuses same code. Remove unneeded references, do nothing for int keys. Check out of bounds or wrong blockname errors. Added tests. Remove default parameter value. PHPBB3-14944	2017-01-28 21:34:08 +01:00
Marc Alexander	5f6133ac7f	Merge branch '3.2.x'	2017-01-27 19:00:37 +01:00
Marc Alexander	2b67536cd0	Merge pull request #4661 from hanakin/ticket/15037 ... [ticket/15037] Make imagesets retina	2017-01-27 18:44:38 +01:00
Marc Alexander	674584f319	Merge branch '3.2.x'	2017-01-25 10:06:30 +01:00
Marc Alexander	e8f41a0dcc	[ticket/15045] Fix user object instantiation in version_test ... PHPBB3-15045	2017-01-24 22:50:10 +01:00
hanakin	8b6d043ca6	[ticket/15037] try larger size limit ... PHPBB3-15037	2017-01-23 23:08:52 -05:00
hanakin	6f7b92ae10	[ticket/15307] fix for good! ... PHPBB3-15037	2017-01-23 22:41:08 -05:00
hanakin	3e73413982	[ticket/15037]a attempt to fix stupid test issue ... PHPBB3-15037	2017-01-23 21:59:00 -05:00
Jakub Senko	779758f219	[ticket/13429] Replace @change with @changed ... PHPBB3-13429	2017-01-23 13:33:15 +01:00
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