25179 commits

Author	SHA1	Message	Date
Marc Alexander	864953ebff	Merge pull request #4616 from marc1706/ticket/14945 ... [ticket/14945] Parse signature preview with generate_text_for_display()	2017-01-06 01:06:06 +01:00
Marc Alexander	af4f477a1b	[ticket/14961] Also translate "learn more" link ... PHPBB3-14961	2017-01-06 01:04:14 +01:00
Marc Alexander	e0eeea800c	[ticket/14961] Add cookie notice as enablable feature ... Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961	2017-01-06 00:57:12 +01:00
Marc Alexander	0a68593dd2	[ticket/14949] Pass full notification array and post data for updating ... PHPBB3-14949	2017-01-05 23:39:30 +01:00
Marc Alexander	93567727fe	Merge branch '3.2.x'	2017-01-04 22:16:47 +01:00
Marc Alexander	0c6c94e527	Merge branch '3.1.x' into 3.2.x	2017-01-04 22:16:24 +01:00
Marc Alexander	77b3f36992	Merge pull request #4532 from senky/ticket/14662 ... [ticket/14662] Add memberlist_team_username_prepend/append	2017-01-04 22:15:37 +01:00
Marc Alexander	777a1ad916	[ticket/14945] Parse signature preview with generate_text_for_display() ... PHPBB3-14945	2017-01-04 22:04:07 +01:00
Marc Alexander	13d0549e59	Merge branch '3.2.x'	2017-01-04 21:50:47 +01:00
Marc Alexander	cfa2bc534b	Merge branch '3.1.x' into 3.2.x	2017-01-04 21:50:25 +01:00
Marc Alexander	a0abb1e10e	Merge pull request #4600 from hubaishan/ticket/14549 ... [ticket/14549] fix mcp page redirect back after topic merge and rised warning	2017-01-04 21:47:21 +01:00
Marc Alexander	c6746ab3cd	[ticket/14946] Make sure to pass integers to max() ... PHPBB3-14946	2017-01-04 21:40:46 +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	0f19c507e2	Merge branch '3.2.x'	2017-01-04 20:31:50 +01:00
Marc Alexander	cae30929ea	Merge branch '3.1.x' into 3.2.x	2017-01-04 20:31:45 +01:00
Marc Alexander	2f6993fa81	Merge pull request #4595 from DavidIQ/ticket/14941 ... [ticket/14941] Apply changes individually for MySQL fulltext search	2017-01-04 20:31:41 +01:00
rxu	49c19a267f	[ticket/14958] Optimize Twig extension lang() function ... PHPBB3-14958	2017-01-05 00:42:27 +07:00
Marc Alexander	3fef34a541	Merge branch '3.2.x'	2017-01-04 17:48:56 +01:00
Marc Alexander	c5ce0cd3c4	Merge pull request #4599 from VSEphpbb/ticket/14945 ... [ticket/14945] Fix bbcode flags in user sig previews	2017-01-04 17:48:52 +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	dd89a369f3	[ticket/14838] Remove obsolete overriding method ... PHPBB3-14838	2017-01-04 17:16:36 +01:00
Marc Alexander	7cad25e4cb	[ticket/14838] Do not query full attachments table in feeds ... The fetch_attachments() will also now throw a runtime exception if a feed tries to do this nonetheless. PHPBB3-14838	2017-01-03 22:56:42 +01:00
Marc Alexander	a4d67c55d9	[ticket/14957] Make sure config_php_file is set before injecting ... PHPBB3-14957	2017-01-03 22:53:18 +01:00
Marc Alexander	9f149e345b	Merge branch 'ticket/14957' into ticket/14957-rhea	2017-01-03 22:22:46 +01:00
Marc Alexander	ff411ee81b	[ticket/14957] Do not use method return in write context ... Fix for PHP 5.3.x compatibility. PHPBB3-14957	2017-01-03 21:53:14 +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	4c550c221b	[ticket/14954] Properly check if topic has attachments in mcp_queue ... PHPBB3-14954	2017-01-02 23:23:53 +01:00
Marc Alexander	b5ad21debc	Merge branch '3.2.x'	2017-01-02 22:55:25 +01:00
Marc Alexander	56314f4c22	Merge pull request #4602 from Nicofuma/ticket/14947 ... [ticket/14947] Updates phpunit to 4.8	2017-01-02 22:52:16 +01:00
Tristan Darricau	387d76aa09	Merge branch '3.2.x' ... * 3.2.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query	2017-01-02 22:47:51 +01:00
Tristan Darricau	2251816b10	Merge branch '3.1.x' into 3.2.x ... * 3.1.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query	2017-01-02 22:47:47 +01:00
Marc Alexander	7df7cfff33	[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query ... PHPBB3-14953	2017-01-02 22:39:40 +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
Tristan Darricau	bab707a00d	Merge branch '3.2.x'	2016-12-30 10:22:24 +01:00
Tristan Darricau	1f65f85b53	Merge branch '3.1.x' into 3.2.x	2016-12-30 10:21:17 +01:00
Tristan Darricau	4139e4f2b5	Merge pull request #4593 from javiexin/ticket/14940 ... [ticket/14940] Add ACP template event acp_ext_details_end	2016-12-30 10:21:00 +01:00
Tristan Darricau	c12b4320eb	Merge branch '3.2.x'	2016-12-30 10:06:29 +01:00
Tristan Darricau	739081b045	Merge branch '3.1.x' into 3.2.x	2016-12-30 10:04:35 +01:00
Tristan Darricau	3489780faa	Merge pull request #4597 from javiexin/ticket/14943 ... [ticket/14943] Fix template loop access by index	2016-12-30 10:04:13 +01:00
Tristan Darricau	5ff0e4ec7d	Merge branch '3.2.x'	2016-12-29 18:27:59 +01:00
Tristan Darricau	1f8f1b6286	Merge pull request #4596 from JoshyPHP/ticket/14914 ... [ticket/14914] Made emoji scale in size with text	2016-12-29 18:27:58 +01:00
Tristan Darricau	b81aaee17f	Merge branch '3.2.x'	2016-12-29 18:18:54 +01:00
Tristan Darricau	d5c063fd80	Merge pull request #4591 from marc1706/ticket/14934 ... [ticket/14934] Use bare PHP functions for checking for tmp dir	2016-12-29 18:18:53 +01:00
hubaishan	40bc4ac484	[ticket/14549] Correcting $redirect var to avoid the bug ... by this correct $redirect will go to clean mcp page after merge PHPBB3-14549	2016-12-29 13:11:19 +03:00
Marc Alexander	7eddb02568	Merge branch '3.2.x'	2016-12-28 22:24:12 +01:00