Marc Alexander 
							
						 
					 
					
						
						
							
						
						1600d82b77 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x  
						
						... 
						
						
						
						Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html 
						
						
					 
					
						2016-03-27 09:59:25 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						266576c6a4 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						Part 4
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						aca6e64669 
					 
					
						
						
							
							[ticket/14272] Only use maxlength and size for allowed input elements  
						
						... 
						
						
						
						PHPBB3-14272 
						
						
					 
					
						2015-11-06 10:20:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						a5ab2eb564 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/14098] Add core events to the search backends 
						
						
					 
					
						2015-10-12 13:38:42 +02:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						d75750fd99 
					 
					
						
						
							
							[ticket/14098] Add core events to the search backends  
						
						... 
						
						
						
						PHPBB3-14098 
						
						
					 
					
						2015-10-09 23:06:16 +07:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						6d3c4d3879 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-06-09 17:19:49 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b7db12a593 
					 
					
						
						
							
							Merge pull request  #3485  from brunoais/ticket/13694  
						
						... 
						
						
						
						[ticket/13694] Allow modifying the Postgres native author search query for results 
						
						
					 
					
						2015-06-09 17:19:42 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						a21650e689 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-06-09 17:11:20 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						83d8ea013b 
					 
					
						
						
							
							Merge pull request  #3481  from brunoais/ticket/13689  
						
						... 
						
						
						
						[ticket/13689] Allow modifying the query for postgres native fulltext search
Conflicts:
	phpBB/develop/search_fill.php
	phpBB/includes/acp/acp_main.php
	phpBB/includes/acp/acp_search.php
	phpBB/includes/functions_admin.php
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_main.php
	phpBB/includes/mcp/mcp_post.php
	phpBB/install/install_convert.php
	phpBB/install/install_install.php
	phpBB/phpbb/search/fulltext_mysql.php
	phpBB/phpbb/search/fulltext_native.php
	phpBB/phpbb/search/fulltext_postgres.php
	phpBB/phpbb/search/fulltext_sphinx.php
	phpBB/search.php
	tests/search/mysql_test.php
	tests/search/native_test.php
	tests/search/postgres_test.php 
						
						
					 
					
						2015-06-09 17:10:44 +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 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						3ac95f48f8 
					 
					
						
						
							
							[ticket/13685] phpBB, not PhpBB  
						
						... 
						
						
						
						PHPBB3-13685 
						
						
					 
					
						2015-06-09 12:55:27 +01:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						1e45a05000 
					 
					
						
						
							
							[ticket/13685] Add phpbb_dispatcher to fulltext search constructors  
						
						... 
						
						
						
						PHPBB3-13685 
						
						
					 
					
						2015-06-07 18:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						c701e8a131 
					 
					
						
						
							
							[ticket/13694] BUMP version to 3.1.5-dev  
						
						... 
						
						
						
						PHPBB3-13694 
						
						
					 
					
						2015-05-06 23:05:30 +01:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						b8a31241a3 
					 
					
						
						
							
							[ticket/13689] BUMP version to 3.1.5-dev  
						
						... 
						
						
						
						PHPBB3-13689 
						
						
					 
					
						2015-05-06 22:59:05 +01:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						cfdaf2d63f 
					 
					
						
						
							
							[ticket/13694] Allow modifying the Postgres native author search query  
						
						... 
						
						
						
						PHPBB3-13694 
						
						
					 
					
						2015-03-12 22:14:20 +00:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						d5dd9c929d 
					 
					
						
						
							
							[ticket/13689] Allow modifying the query for postgres native fulltext search  
						
						... 
						
						
						
						PHPBB3-13689 
						
						
					 
					
						2015-03-12 12:22:45 +00:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						c3a0e09ddb 
					 
					
						
						
							
							[ticket/13685] Add phpbb_dispatcher to fulltext search constructors  
						
						... 
						
						
						
						PHPBB3-13685 
						
						
					 
					
						2015-03-12 12:21:15 +00:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						79d4ff5538 
					 
					
						
						
							
							[ticket/13494] Update calls to set_config()  
						
						... 
						
						
						
						PHPBB3-13494 
						
						
					 
					
						2015-02-02 19:28:23 +01:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						8006746780 
					 
					
						
						
							
							[ticket/12557] Fix php file description  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-07 13:19:49 +03:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						8f2395857e 
					 
					
						
						
							
							[ticket/12557] Search, cron and profilefields fixes  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-03 07:06:29 +03:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						e3e0c79b7a 
					 
					
						
						
							
							[ticket/12515] Remove check for PostgreSQL 8.3+  
						
						... 
						
						
						
						PHPBB3-12515 
						
						
					 
					
						2014-07-06 19:31:46 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						ff6e026a40 
					 
					
						
						
							
							[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts  
						
						... 
						
						
						
						PHPBB3-12446 
						
						
					 
					
						2014-06-26 21:09:19 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						09fc008e62 
					 
					
						
						
							
							[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy  
						
						... 
						
						
						
						PHPBB3-12721 
						
						
					 
					
						2014-06-16 22:35:41 +02:00 
						 
				 
			
				
					
						
							
							
								Yuriy Rusko 
							
						 
					 
					
						
						
							
						
						a759704b39 
					 
					
						
						
							
							[ticket/12594] Remove @package tags and update file headers  
						
						... 
						
						
						
						PHPBB3-12594 
						
						
					 
					
						2014-05-27 20:51:13 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						11a9104b8a 
					 
					
						
						
							
							[ticket/12282] Use interface for type hinting  
						
						... 
						
						
						
						PHPBB3-12282 
						
						
					 
					
						2014-04-01 19:17:41 +02:00 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						932e0eb17e 
					 
					
						
						
							
							[ticket/11040] Swap post_text and post_subject for post_content index  
						
						... 
						
						
						
						Provides better performance as per PostgreSQL Docs.
PHPBB3-11040 
						
						
					 
					
						2014-03-12 11:02:04 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						101ceed80c 
					 
					
						
						
							
							[ticket/11040] Remove postgres extra indexes  
						
						... 
						
						
						
						Remove post_text index as post_content index is sufficient to search post
text.
PHPBB3-11040 
						
						
					 
					
						2014-03-12 11:02:00 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						87688687e4 
					 
					
						
						
							
							[ticket/11040] Add post_content index  
						
						... 
						
						
						
						In addition to post_subject and post_title indexes add a post_content
which is concatenation of both the columns.
PHPBB3-11040 
						
						
					 
					
						2014-03-12 11:01:42 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						274c83c74d 
					 
					
						
						
							
							[ticket/11040] Search subject and text together  
						
						... 
						
						
						
						Instead of searching for post_subject and post_text seperately and then
OR them in where clause we use concatenation of the two columns and search
PHPBB3-11040 
						
						
					 
					
						2014-03-12 11:01:21 +05:30 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						7aa8f6461f 
					 
					
						
						
							
							[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.  
						
						... 
						
						
						
						PHPBB3-11980 
						
						
					 
					
						2013-10-30 13:05:28 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						06e7c84235 
					 
					
						
						
							
							[ticket/11700] Fix some more incorrectly changed comments  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-19 15:27:03 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						d905358e2b 
					 
					
						
						
							
							[ticket/11700] Fix leftover backslashes in comments  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 05:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						b95fdacdd3 
					 
					
						
						
							
							[ticket/11700] Move all recent code to namespaces  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 00:25:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						7030578bbe 
					 
					
						
						
							
							[ticket/11698] Moving all autoloadable files to phpbb/  
						
						... 
						
						
						
						PHPBB3-11698 
						
						
					 
					
						2013-07-14 01:32:34 -04:00