183 commits

Author	SHA1	Message	Date
Tristan Darricau	c59ef8bd2f	Merge branch '3.2.x' ... * 3.2.x: [ticket/15304] Update s9e/text-formatter dependency	2017-08-06 11:52:08 +02:00
JoshyPHP	5b67939e6a	[ticket/15304] Update s9e/text-formatter dependency ... https://github.com/s9e/TextFormatter/releases/tag/0.11.0 PHPBB3-15304	2017-08-05 18:28:09 +02:00
rxu	07c6e821d5	[ticket/14972] Bump PHP requirements to 5.6. Update dependencies. ... Also bump to PHP 7.2 compatible versions: PHPUnit to 5.7, Guzzle to 6.3. PHPBB3-14972	2017-07-17 16:56:53 +07:00
Marc Alexander	f101532c09	Merge branch '3.2.x'	2017-07-16 21:42:30 +02:00
JoshyPHP	329e5c5e05	[ticket/15261] Fix censoring HTML tags ... PHPBB3-15261	2017-07-03 16:06:50 +02:00
Marc Alexander	a44f31ec42	Merge branch '3.2.x'	2017-06-11 19:09:02 +02:00
Marc Alexander	a079c5fed0	Merge branch 'ticket/15178' into ticket/15179	2017-05-31 20:20:43 +02:00
Marc Alexander	e3ec1440ef	[ticket/15178] Run update again ... PHPBB3-15178	2017-05-31 20:06:33 +02:00
Tristan Darricau	1f9a269d78	[ticket/11150] Makes the customisation db lync dynamic ... PHPBB3-11150	2017-04-23 21:09:59 +02:00
Tristan Darricau	fbf11d61aa	[ticket/11150] Updates deps + fix various issues ... PHPBB3-11150	2017-04-23 21:01:14 +02:00
Tristan Darricau	fbb85e2f4f	[ticket/11150] Add ability to manage extensions through composer ... PHPBB3-11150	2017-04-23 21:01:01 +02:00
Tristan Darricau	1e14328493	Merge branch '3.2.x' ... * 3.2.x: [ticket/15158] Update oauth to v0.8.10	2017-04-18 23:54:27 +02:00
Tristan Darricau	7a4d6209fd	Merge pull request #4786 from vinny/ticket/15158 ... [ticket/15158] Update oauth to v0.8.10 * github.com:phpbb/phpbb: [ticket/15158] Update oauth to v0.8.10	2017-04-18 23:53:43 +02:00
Tristan Darricau	a4d1c60b00	Merge branch '3.2.x' ... * 3.2.x: [ticket/15103] Update fast-image-size to 1.1.3	2017-04-18 23:07:41 +02:00
Marc Alexander	3dd1f9e707	[ticket/15178] Update dependencies for 3.1.x ... PHPBB3-15178	2017-04-17 12:40:09 +02:00
Vinny	91fc8f407a	[ticket/15158] Update oauth to v0.8.10 ... PHPBB3-15158	2017-04-04 04:20:00 -03:00
Matt Friedman	c6321fc61b	[ticket/15153] Update to newer homestead for vagrant ... PHPBB3-15153	2017-03-26 16:31:59 -07:00
Marc Alexander	0b11f2947c	[ticket/15103] Update fast-image-size to 1.1.3 ... This fixes issus with filename casing and JPEG files only using EXIF header data. PHPBB3-15103	2017-03-26 14:57:48 +02:00
Marc Alexander	defcb1c46f	Merge branch '3.2.x'	2017-01-22 23:00:12 +01:00
JoshyPHP	f53f6d1c61	[ticket/15040] Updated s9e\TextFormatter to 0.9.1 ... PHPBB3-15040	2017-01-22 19:11:17 +01:00
Marc Alexander	7973984821	Merge branch '3.2.x'	2017-01-15 14:06:13 +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	b5ad21debc	Merge branch '3.2.x'	2017-01-02 22:55:25 +01:00
Tristan Darricau	e88aecd3b4	[ticket/14947] Updates phpunit to 4.8 ... $ composer update phpunit/phpunit --with-dependencies Dependency "symfony/yaml" is also a root requirement, but is not explicitly whitelisted. Ignoring. Loading composer repositories with package information Updating dependencies (including require-dev) - Installing sebastian/global-state (1.1.1) Loading from cache - Installing doctrine/instantiator (1.0.5) Loading from cache - Removing phpunit/phpunit-mock-objects (2.1.5) - Installing phpunit/phpunit-mock-objects (2.3.8) Loading from cache - Removing phpunit/php-file-iterator (1.3.4) - Installing phpunit/php-file-iterator (1.4.2) Loading from cache - Installing phpdocumentor/reflection-docblock (2.0.4) Downloading: 100% - Installing phpspec/prophecy (v1.6.2) Loading from cache - Removing phpunit/phpunit (4.1.6) - Installing phpunit/phpunit (4.8.31) Downloading: 100% sebastian/global-state suggests installing ext-uopz (*) phpdocumentor/reflection-docblock suggests installing dflydev/markdown (~1.0) phpdocumentor/reflection-docblock suggests installing erusev/parsedown (~1.0) Writing lock file Generating autoload files > echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.' You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies. PHPBB3-14947	2016-12-30 21:58:38 +01:00
Máté Bartus	c5f5ab2c3f	Merge branch '3.2.x'	2016-12-09 12:44:44 +01:00
Marc Alexander	7fedc19cc4	[ticket/14891] Use own proxy instantiator for open_basedir compatibility ... Also reverted random_compat lib to 1.4.x. PHPBB3-14891	2016-12-09 08:17:51 +01:00
Marc Alexander	bc6ce4c4af	Merge branch '3.2.x'	2016-12-06 15:18:02 +01:00
Marc Alexander	e5504b74f0	[ticket/14892] Revert to twig 1.24 to have working assets again ... Twig 1.25 and after introduced a way of handling both relative and absolute paths. However, it seems to handle absolute windows paths as relative paths. This breaks any assets or similar ways of including files into the main template files. PHPBB3-14892	2016-12-06 14:42:14 +01:00
Tristan Darricau	fd6de052ef	Merge branch '3.2.x' ... * 3.2.x: [ticket/14867] Revert back to twig 1.26.* and update dependencies	2016-11-24 14:23:24 +01:00
Marc Alexander	a96fc3d87f	[ticket/14867] Revert back to twig 1.26.* and update dependencies ... The revert of twig back to 1.26.* is necessary due to a breaking change in the way the Filesystem loader returns the paths to template files. PHPBB3-14867	2016-11-16 21:39:29 +01:00
Tristan Darricau	462fb7b296	Merge branch '3.2.x' ... * 3.2.x: [ticket/14716] Update dependencies to latest versions	2016-11-14 21:36:34 +01:00
Marc Alexander	4d07f8a134	[ticket/14716] Update dependencies to latest versions ... This addresses some issues with symfony that resulted in issues when open_basedir restrictions were enabled, as well as issues with JPEG images in fast-image-size. The phpBB class extending the twig lexer also had to be modified to ensure compatibility after BC was broken by the PR https://github.com/twigphp/Twig/pull/2182 for twig 1.27. PHPBB3-14716	2016-11-03 21:36:12 +01:00
Máté Bartus	65d09b1dce	Merge branch '3.2.x'	2016-11-02 10:02:09 +01:00
JoshyPHP	33f1934b72	[ticket/14846] Updated s9e\TextFormatter ... PHPBB3-14846	2016-11-02 09:19:35 +01:00
Marc Alexander	8f4ea4c495	Merge branch '3.2.x'	2016-10-10 21:39:21 +02:00
Tristan Darricau	b2711371f1	[ticket/14807] s9e/textformatter 0.8.1 ... PHPBB3-14807	2016-10-10 20:07:33 +02:00
Tristan Darricau	1100db7e86	[ticket/14807] Updates paragonie/random_compat ... PHPBB3-14807	2016-10-09 22:03:50 +02:00
Tristan Darricau	4c60995d7a	[ticket/14807] Updates everything else ... PHPBB3-14807	2016-10-02 19:40:49 +02:00
Tristan Darricau	7a5fbd0257	[ticket/14807] Updates Twig ... PHPBB3-14807	2016-10-02 19:24:45 +02:00
Tristan Darricau	c4812a2d83	Merge branch '3.2.x' ... * 3.2.x: [ticket/14797] Support PHP 7.1 and clearly state support for latest versions	2016-09-25 17:26:32 +02:00
Marc Alexander	9e52ed9af1	[ticket/14797] Support PHP 7.1 and clearly state support for latest versions ... PHPBB3-14797	2016-09-25 12:54:01 +02:00
Marc Alexander	9dbe47ba8e	Merge branch '3.2.x'	2016-08-16 20:49:36 +02:00
JoshyPHP	260a0a29ad	[ticket/14740] Added support for quoted attributes in BBCode definitions ... PHPBB3-14740	2016-08-10 03:19:38 +02:00
Máté Bartus	6ca10fc85a	Merge branch '3.2.x'	2016-08-05 21:29:27 +02:00
Marc Alexander	dd01de03bf	[ticket/14735] Update composer dependencies to latest versions ... This will update Symfony to 2.8.9, fast-image-size to 1.1.1, and text-formatter to 0.6.1. PHPBB3-14735	2016-08-05 20:26:58 +02:00
Marc Alexander	59a228f7cd	[ticket/14670] Use symfony 3.1 in master branch ... Removed sami as it doesn't have a version compatible with symfony 3.x. PHPBB3-14670	2016-07-23 17:13:54 +02:00
Máté Bartus	0336bef2d9	Merge branch '3.2.x'	2016-07-19 19:24:52 +02:00
Máté Bartus	d2ff12256c	Merge branch '3.1.x' into 3.2.x	2016-07-19 19:23:35 +02:00
Marc Alexander	f3fe610a5e	[ticket/14538] Update symfony dependencies to latest versions ... PHPBB3-14538	2016-07-19 17:58:41 +02:00
Máté Bartus	5760099618	Merge branch '3.2.x'	2016-07-19 10:20:21 +02:00