9816 commits

Author	SHA1	Message	Date
Marc Alexander	01097a24b5	Merge branch '3.1.x' ... Conflicts: tests/template/template_includecss_test.php	2015-07-08 22:54:26 +02:00
Matt Friedman	04d34e6c8b	[ticket/13995] Invalid avatar HTML missing space between elements ... PHPBB3-13995	2015-07-07 20:10:18 -07:00
Tristan Darricau	d54aa190f1	Merge pull request #3623 from s9e/ticket/10620 ... [ticket/10620] Quote improvements	2015-07-07 09:46:36 +02:00
Tristan Darricau	e4696318bd	Merge pull request #3689 from s9e/ticket/13880-fix-master ... [ticket/13880] Merge branch 'fix-3.1' into fix-master	2015-06-29 11:33:20 +02:00
Tristan Darricau	2be39c5a8f	Merge pull request #3654 from s9e/ticket/13880 ... [ticket/13880] Automatically remove quotes that are nested too deep	2015-06-29 11:33:00 +02:00
Joas Schilling	03b1b63520	Merge branch '3.1.x'	2015-06-27 11:06:30 +02:00
Joas Schilling	2237030398	Merge pull request #3725 from RMcGirr83/ticket/13962 ... [ticket/13962] MCP Queue dropdown for forum selection	2015-06-27 11:01:47 +02:00
JoshyPHP	d9db021af4	[ticket/13880] Merge branch 'ticket/13880' into ticket/13880-fix-master ... PHPBB3-13880	2015-06-27 04:34:12 +02:00
JoshyPHP	ae2237f640	[ticket/13880] Replaced the quote regexp to allow brackets ... This matches the regexp used in bbcode::bbcode_cache_init() PHPBB3-13880	2015-06-27 04:25:54 +02:00
JoshyPHP	817db2f135	[ticket/13880] Automatically remove quotes that are nested too deep ... PHPBB3-13880	2015-06-27 02:52:26 +02:00
Marc Alexander	9e117a9eeb	Merge branch '3.1.x' ... Conflicts: phpBB/includes/mcp/mcp_post.php	2015-06-26 10:25:10 +02:00
Crizzo	ef6af2682b	[ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post ... PHPBB3-13966	2015-06-25 22:22:56 +02:00
JoshyPHP	129b3375ae	[ticket/10620] Added enhanced quotes in pm history ... PHPBB3-10620	2015-06-25 03:11:58 +02:00
JoshyPHP	06936bda05	[ticket/10620] Added enhanced quotes in topic review ... Added support for enhanced quotes in topic_review's quote button. NOTE: the UI doesn't appear to be testable via PhantomJS. PHPBB3-10620	2015-06-25 03:11:58 +02:00
JoshyPHP	f02cc27014	[ticket/10620] Implemented quote improvements ... PHPBB3-10620	2015-06-25 03:11:55 +02:00
Tristan Darricau	6bcf12a558	Merge pull request #3618 from marc1706/ticket/13832 ... [ticket/13832] Use preg_replace_callback instead of /e modifier	2015-06-24 16:36:15 +02:00
Tristan Darricau	d430acb568	Merge pull request #3669 from s9e/ticket/13901 ... [ticket/13901] Add more whitespace to long quotes for readability	2015-06-24 16:34:53 +02:00
Marc Alexander	510f704bc8	Merge branch '3.1.x'	2015-06-24 08:54:50 +02:00
Marc Alexander	84bbd4490e	Merge pull request #3538 from RMcGirr83/ticket/13759 ... [ticket/13759] Take post_time into account	2015-06-24 08:54:45 +02:00
Marc Alexander	58b40945b0	Merge branch '3.1.x'	2015-06-24 08:52:05 +02:00
Marc Alexander	11e312f41c	Merge pull request #3528 from RMcGirr83/ticket/13598 ... [ticket/13598] Allow topic lock on topic creation	2015-06-24 08:51:57 +02:00
RMcGirr83	2ec5c5de17	[ticket/13962] MCP Queue dropdown for forum selection ... PHPBB3-13962	2015-06-23 13:26:47 -04:00
Andreas Fischer	759eb29215	Merge branch '3.1.x' ... * 3.1.x: [ticket/13948] Correctly forwarding to the RIR for whois feature	2015-06-21 21:53:03 +02:00
rxu	bcac964cd0	[ticket/13948] Correctly forwarding to the RIR for whois feature ... Allow any space count in the ReferralServer string for whois services response. PHPBB3-13948	2015-06-21 15:48:28 +07:00
Marc Alexander	ef890e3363	Merge branch '3.1.x'	2015-06-17 15:39:12 +02:00
Tristan Darricau	ceed27fe27	Merge pull request #3661 from marc1706/ticket/6466 ... [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips	2015-06-17 10:07:12 +02:00
Matt Friedman	4f05364eb9	[ticket/13882] Add lazy load avatars to phpbb wrappers ... PHPBB3-13882	2015-06-16 11:58:31 -07:00
Marc Alexander	80768b526b	Merge branch '3.1.x' ... Conflicts: phpBB/phpbb/user_loader.php	2015-06-16 12:35:51 +02:00
Marc Alexander	dc9245dd7a	Merge pull request #3653 from callumacrae/ticket/13882 ... [ticket/13882] Lazy load the notification avatars.	2015-06-16 12:33:17 +02:00
Andreas Fischer	2eceaaddf6	Merge branch '3.1.x' ... * 3.1.x: [ticket/10711] Duplicate key error on forum_tracks_table	2015-06-13 16:27:44 +02:00
Andreas Fischer	89f7fc63e8	Merge pull request #3703 from javiexin/ticket/10711 ... [ticket/10711] Duplicate key error on forum_tracks_table * javiexin/ticket/10711: [ticket/10711] Duplicate key error on forum_tracks_table	2015-06-13 16:27:44 +02:00
javiexin	7b026eff79	[ticket/10711] Duplicate key error on forum_tracks_table ... In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY' in the forums_track table is produced when marking forums read (viewforum.php?f=xx&mark=forums). The problem happens when there are duplicates in the forum_id array. The solution is to remove those duplicates. PHPBB3-10711	2015-06-13 01:08:18 +02:00
Joas Schilling	9238d28353	[3.1.x] Update dev version to 3.1.6-RC1	2015-06-11 23:25:43 +02:00
Joas Schilling	7bb617eeb6	Merge branch 'prep-release-3.1.5' into 3.1.x	2015-06-11 23:24:02 +02:00
Joas Schilling	a3883a6f23	Merge branch '3.1.x' ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg	2015-06-11 21:00:04 +02:00
Joas Schilling	4276962e78	[3.1.x] Increase dev version to 3.1.6-dev	2015-06-11 20:57:26 +02:00
Joas Schilling	3d18d6dc77	[ticket/13823] Move the part of the query, so the update will get it correctly ... PHPBB3-13823	2015-06-09 23:11:26 +02:00
Andreas Fischer	9713f52fc6	Merge branch '3.1.x' ... * 3.1.x: [ticket/13923] CS [ticket/13923] Update startup.php	2015-06-09 21:27:56 +02:00
Andreas Fischer	d8343f2108	Merge pull request #3685 from Nicofuma/ticket/13923 ... [ticket/13923] Update startup.php * Nicofuma/ticket/13923: [ticket/13923] CS [ticket/13923] Update startup.php	2015-06-09 21:27:49 +02:00
Andreas Fischer	1f4976f590	Merge pull request #3696 from marc1706/ticket/13930-master ... [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis	2015-06-09 21:27:23 +02:00
Andreas Fischer	c952622fa0	Merge pull request #3694 from marc1706/ticket/13930 ... [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis	2015-06-09 21:27:07 +02:00
Tristan Darricau	b5573bb92d	[ticket/13923] CS ... PHPBB3-13923	2015-06-09 21:22:52 +02:00
Joas Schilling	d2a2c183ed	[prep-release-3.1.5] Update version to 3.1.5-RC1	2015-06-09 20:30:40 +02:00
Marc Alexander	b2ada8ba09	Merge branch '3.1.x' ... Conflicts: phpBB/includes/mcp/mcp_main.php	2015-06-09 15:24:08 +02:00
Marc Alexander	072f4c9260	Merge pull request #3479 from brunoais/ticket/13685 ... [ticket/13685] Allow modifying the query for mysql native fulltext search	2015-06-09 14:27:13 +02:00
brunoais	6e8da5a424	[ticket/13685] This should take care of the rest ... PHPBB3-13685	2015-06-08 18:09:48 +01:00
Marc Alexander	d3e55a8290	Merge branch '3.1.x' ... Conflicts: phpBB/posting.php	2015-06-08 17:59:49 +02:00
Oliver Schramm	c2d254ea41	Merge branch 'ticket/13833-30x' into ticket/13833 ... Conflicts: phpBB/posting.php PHPBB3-13833	2015-06-08 17:19:11 +02:00
Oliver Schramm	2c6369c5d9	[ticket/13833] Prevent flooding if type=submit doesn't exist ... PHPBB3-13833	2015-06-08 17:01:52 +02:00
Marc Alexander	2e31cae7bf	Merge branch 'ticket/13930' into ticket/13930-master ... Conflicts: phpBB/includes/acp/acp_database.php	2015-06-08 15:39:47 +02:00