Oliver Schramm 
							
						 
					 
					
						
						
							
						
						8ed59fb82a 
					 
					
						
						
							
							[ticket/14250] Change token_storage class to fit changed interface  
						
						... 
						
						
						
						PHPBB3-14250 
						
						
					 
					
						2016-01-04 03:38:28 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						77bc8ee68b 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php 
						
						
					 
					
						2015-06-07 14:59:33 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						bac02a348e 
					 
					
						
						
							
							Merge pull request  #22  from phpbb/ticket/sec-184  
						
						... 
						
						
						
						[ticket/sec-184] Do not output passwords to HTML 
						
						
					 
					
						2015-06-07 14:57:06 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f3f82bd377 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-06-04 17:30:16 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						9005711ad7 
					 
					
						
						
							
							Merge pull request  #3502  from marc1706/ticket/13564  
						
						... 
						
						
						
						[ticket/13564] Unlink user accounts upon deleting user 
						
						
					 
					
						2015-06-04 17:30:09 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						78b0c938a2 
					 
					
						
						
							
							[ticket/sec-184] Do not output LDAP password to HTML  
						
						... 
						
						
						
						SECURITY-184 
						
						
					 
					
						2015-06-04 14:29:03 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						f958d05aed 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/13790] Update phpcs
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock 
						
						
					 
					
						2015-05-30 10:58:40 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						01073ffcbf 
					 
					
						
						
							
							Merge pull request  #3560  from Nicofuma/ticket/13790  
						
						... 
						
						
						
						[ticket/13790] Update phpcs 
						
						
					 
					
						2015-05-30 10:53:47 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						a462f14aa3 
					 
					
						
						
							
							[ticket/13790] Update phpcs  
						
						... 
						
						
						
						PHPBB3-13790 
						
						
					 
					
						2015-05-19 22:19:18 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						3b91b243b0 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-05-16 13:40:07 +02:00 
						 
				 
			
				
					
						
							
							
								Nicofuma 
							
						 
					 
					
						
						
							
						
						62e13e945c 
					 
					
						
						
							
							[ticket/13838] Fix coding style  
						
						... 
						
						
						
						PHPBB3-13838 
						
						
					 
					
						2015-05-14 15:43:44 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						4d7cb7ca73 
					 
					
						
						
							
							[ticket/13564] Use user_id from link_data for unlinking account in oauth  
						
						... 
						
						
						
						PHPBB3-13564 
						
						
					 
					
						2015-03-24 17:08:55 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						ca883f1196 
					 
					
						
						
							
							[ticket/13564] Allow to specify user id for retrieving auth link data  
						
						... 
						
						
						
						PHPBB3-13564 
						
						
					 
					
						2015-03-24 17:08:55 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						71eb981a81 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN 
						
						
					 
					
						2015-02-22 18:57:36 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						71d3ddc623 
					 
					
						
						
							
							[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN  
						
						... 
						
						
						
						PHPBB3-13551 
						
						
					 
					
						2015-02-19 18:38:35 -08:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						b5544b2f47 
					 
					
						
						
							
							[ticket/13450] Type-hint return value of $phpbb_container->get()  
						
						... 
						
						
						
						PHPBB3-13450 
						
						
					 
					
						2015-01-12 20:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						c98cceaf22 
					 
					
						
						
							
							Merge pull request  #3068  from marc1706/ticket/13204  
						
						... 
						
						
						
						[ticket/13204] Tell user that password was incorrect when exceeding attempts 
						
						
					 
					
						2014-11-21 22:52:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						91f7d53d8e 
					 
					
						
						
							
							[ticket/13332] Remove useless $result assignment  
						
						... 
						
						
						
						PHPBB3-13332 
						
						
					 
					
						2014-11-11 19:02:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						040fc6dd0f 
					 
					
						
						
							
							[ticket/13332] Pass user row to passwords manager check method  
						
						... 
						
						
						
						PHPBB3-13332 
						
						
					 
					
						2014-11-11 19:02:01 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver Schramm 
							
						 
					 
					
						
						
							
						
						c4628bd92a 
					 
					
						
						
							
							[ticket/13301] Fix called function in apche auth module  
						
						... 
						
						
						
						PHPBB3-13301 
						
						
					 
					
						2014-11-09 01:37:28 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						0868831675 
					 
					
						
						
							
							[ticket/13204] Tell user that password was incorrect when exceeding attempts  
						
						... 
						
						
						
						At the end of the login method, the captcha was entered correctly and only
the password was incorrect. Therefore, just tell the user that the password
was incorrect. He will see that he still needs to enter a captcha.
PHPBB3-13204 
						
						
					 
					
						2014-11-02 11:18:08 +01:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						7313cc777e 
					 
					
						
						
							
							[ticket/13085] Fix typo in oauth.php  
						
						... 
						
						
						
						PHPBB3-13085 
						
						
					 
					
						2014-09-21 00:33:07 +03:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						e31aafb393 
					 
					
						
						
							
							[ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth  
						
						... 
						
						
						
						PHPBB3-12975 
						
						
					 
					
						2014-08-12 23:12:57 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						2cbcf4bcbf 
					 
					
						
						
							
							[ticket/11854] Fix the factory in \phpbb\auth\provider\db  
						
						... 
						
						
						
						PHPBB3-11854 
						
						
					 
					
						2014-08-11 01:16:42 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						160ff7b912 
					 
					
						
						
							
							[ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins  
						
						... 
						
						
						
						PHPBB3-11854 
						
						
					 
					
						2014-08-11 01:15:49 +02:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						8006746780 
					 
					
						
						
							
							[ticket/12557] Fix php file description  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-07 13:19:49 +03:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						6ac8d17af6 
					 
					
						
						
							
							[ticket/12557] Fix doc block errors found by Sami  
						
						... 
						
						
						
						More corrections.
PHPBB3-12557 
						
						
					 
					
						2014-08-03 07:13:20 +03:00 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						ffcf45abf3 
					 
					
						
						
							
							[ticket/12557] Fix doc block errors found by Sami pt1  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-03 07:03:08 +03:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						404c2f1144 
					 
					
						
						
							
							Merge pull request  #2598  from Nicofuma/ticket/12716  
						
						... 
						
						
						
						[ticket/12716] Add the missing parameters in the call of clearToken
* Nicofuma/ticket/12716:
  [ticket/12716] Use a string as session_id
  [ticket/12716] Add regression test
  [ticket/12716] Add the missing parameters in the call of clearToken 
						
						
					 
					
						2014-06-27 16:00:29 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						d7b9e33b94 
					 
					
						
						
							
							[ticket/12715] Cleanup comments in \phpbb\auth\provider\*  
						
						... 
						
						
						
						PHPBB3-12715 
						
						
					 
					
						2014-06-15 16:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						7c51418420 
					 
					
						
						
							
							[ticket/12716] Add the missing parameters in the call of clearToken  
						
						... 
						
						
						
						PHPBB3-12716 
						
						
					 
					
						2014-06-15 16:10:55 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						4698f6928e 
					 
					
						
						
							
							[ticket/12352] Remove usages of user_pass_convert column  
						
						... 
						
						
						
						PHPBB3-12352 
						
						
					 
					
						2014-06-01 21:31:05 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						60cb648ab0 
					 
					
						
						
							
							[ticket/12352] Remove code for converting passwords in db auth provider  
						
						... 
						
						
						
						PHPBB3-12352 
						
						
					 
					
						2014-06-01 21:31:04 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						ed1d4fe4a0 
					 
					
						
						
							
							[ticket/12352] Revert to db auth provider if default does not exist  
						
						... 
						
						
						
						This will make sure that we will not encounter a non-existing auth provider.
We will revert to the default db auth provider if the one set in the config
does not exist in our auth provider collection.
PHPBB3-12352 
						
						
					 
					
						2014-06-01 21:31:04 +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 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						2c9e6f196b 
					 
					
						
						
							
							[ticket/12156] Add missing passwords manager to oauth  
						
						... 
						
						
						
						PHPBB3-12156 
						
						
					 
					
						2014-02-03 18:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						382317b135 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/phpbb/phpbb  into feature/passwords  
						
						... 
						
						
						
						Conflicts:
	phpBB/config/services.yml 
						
						
					 
					
						2013-12-29 13:46:42 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						ac131a5159 
					 
					
						
						
							
							[feature/passwords] Fix indentation in auth providers  
						
						... 
						
						
						
						PHPBB3-11610 
						
						
					 
					
						2013-12-28 16:56:20 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						7f58a4572e 
					 
					
						
						
							
							[ticket/11981] Fix code sniffer complaints  
						
						... 
						
						
						
						PHPBB3-11981 
						
						
					 
					
						2013-10-28 23:05:46 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						bb836b65e3 
					 
					
						
						
							
							[feature/passwords] Integrate convert_flag with db auth provider  
						
						... 
						
						
						
						PHPBB3-11610 
						
						
					 
					
						2013-10-25 15:21:09 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						d310c17c7f 
					 
					
						
						
							
							[ticket/11908] Namespacify phpbb_auth_provider_oauth_service_exception.  
						
						... 
						
						
						
						PHPBB3-11908 
						
						
					 
					
						2013-10-11 14:52:07 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						356f3eef07 
					 
					
						
						
							
							[feature/passwords] Inject passwords manager into auth providers  
						
						... 
						
						
						
						The passwords manager will replace the old method of using the functions
phpbb_hash() and phpbb_check_hash().
PHPBB3-11610 
						
						
					 
					
						2013-10-02 13:28:38 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						06e7c84235 
					 
					
						
						
							
							[ticket/11700] Fix some more incorrectly changed comments  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-19 15:27:03 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						1d7f8f8193 
					 
					
						
						
							
							[ticket/11700] Get functional tests running after develop merge  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-17 18:10:58 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						d905358e2b 
					 
					
						
						
							
							[ticket/11700] Fix leftover backslashes in comments  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 05:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						d626ebaf1e 
					 
					
						
						
							
							[ticket/11700] Fix a few more comments  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 04:45:58 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						1fa673bded 
					 
					
						
						
							
							[ticket/11700] Fix authentication acp after develop merge  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 03:22:13 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						2472271bc0 
					 
					
						
						
							
							[ticket/11700] Fix tests after merging new develop code  
						
						... 
						
						
						
						PHPBB3-11700 
						
						
					 
					
						2013-09-16 02:41:03 +02:00