Tristan Darricau 
							
						 
					 
					
						
						
							
						
						4eb72a4e7b 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event 
						
						
					 
					
						2017-02-05 18:05:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						d1df78604b 
					 
					
						
						
							
							[ticket/13601] Add core.acl_clear_prefetch_after event  
						
						... 
						
						
						
						PHPBB3-13601 
						
						
					 
					
						2017-01-23 15:00:59 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						8a3147faf8 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						
						
						
					 
					
						2016-11-13 21:29:14 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						df0388ccc5 
					 
					
						
						
							
							[ticket/14825] Add core.auth_oauth_(login/link)_after  
						
						... 
						
						
						
						PHPBB3-14825 
						
						
					 
					
						2016-11-13 18:19:21 +01:00 
						 
				 
			
				
					
						
							
							
								Jakub Senko 
							
						 
					 
					
						
						
							
						
						33d1d19f97 
					 
					
						
						
							
							[ticket/14586] Add OAuth1 support  
						
						... 
						
						
						
						PHPBB3-14586 
						
						
					 
					
						2016-05-30 13:02:49 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						386d31ec63 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https 
						
						
					 
					
						2016-03-27 12:56:03 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						accf8f8625 
					 
					
						
						
							
							[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https  
						
						... 
						
						
						
						PHPBB3-14481 
						
						
					 
					
						2016-02-15 22:06:25 +01:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						5f85f19a5e 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						
						
						
					 
					
						2015-10-24 18:23:52 +02:00 
						 
				 
			
				
					
						
							
							
								Paul Sohier 
							
						 
					 
					
						
						
							
						
						9596db9b88 
					 
					
						
						
							
							[ticket/14258] Add event into auth::login before session creation  
						
						... 
						
						
						
						Fix typo
PHPBB3-14258 
						
						
					 
					
						2015-10-24 18:00:55 +02:00 
						 
				 
			
				
					
						
							
							
								Paul Sohier 
							
						 
					 
					
						
						
							
						
						2a218c2959 
					 
					
						
						
							
							[ticket/14258] Add event into auth::login before session creation  
						
						... 
						
						
						
						Update comments regarding variables.
PHPBB3-14258 
						
						
					 
					
						2015-10-24 17:47:04 +02:00 
						 
				 
			
				
					
						
							
							
								Paul Sohier 
							
						 
					 
					
						
						
							
						
						7615a5c22f 
					 
					
						
						
							
							[ticket/14258] Add event into auth::login before session creation  
						
						... 
						
						
						
						Add a new event in the login method just before the session create,
so extensions can do some additional validation during login.
PHPBB3-14258 
						
						
					 
					
						2015-10-24 14:28:29 +02: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 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						d9c868d0f5 
					 
					
						
						
							
							[ticket/13248] Correctly pass provider name  
						
						... 
						
						
						
						PHPBB3-13248 
						
						
					 
					
						2014-11-01 21:54:27 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						c3f5dc75be 
					 
					
						
						
							
							[ticket/13248] Allow specifying different auth provider in provider collection  
						
						... 
						
						
						
						PHPBB3-13248 
						
						
					 
					
						2014-11-01 21:54:14 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						6b057e026c 
					 
					
						
						
							
							[ticket/13248] Use auth provider collection for getting provider  
						
						... 
						
						
						
						PHPBB3-13248 
						
						
					 
					
						2014-11-01 21:54:06 +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 
							
						 
					 
					
						
						
							
						
						95ec9590df 
					 
					
						
						
							
							[ticket/12557] Fix doc block errors found by Sami  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-03 07:13:20 +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 
						 
				 
			
				
					
						
							
							
								n-aleha 
							
						 
					 
					
						
						
							
						
						19b9df7e63 
					 
					
						
						
							
							[ticket/12557] Fix doc block errors found by Sami  
						
						... 
						
						
						
						PHPBB3-12557 
						
						
					 
					
						2014-08-03 06:57:05 +03:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						53ff23671c 
					 
					
						
						
							
							Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus  
						
						... 
						
						
						
						* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts 
						
						
					 
					
						2014-07-04 21:08:20 +02: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 
							
						 
					 
					
						
						
							
						
						ff6e026a40 
					 
					
						
						
							
							[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts  
						
						... 
						
						
						
						PHPBB3-12446 
						
						
					 
					
						2014-06-26 21:09:19 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						fa5afb60aa 
					 
					
						
						
							
							[ticket/12726] Ensure PHP files do not contain any unused use statements  
						
						... 
						
						
						
						PHPBB3-12726 
						
						
					 
					
						2014-06-22 23:52:16 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						09fc008e62 
					 
					
						
						
							
							[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy  
						
						... 
						
						
						
						PHPBB3-12721 
						
						
					 
					
						2014-06-16 22:35:41 +02:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						d7b9e33b94 
					 
					
						
						
							
							[ticket/12715] Cleanup comments in \phpbb\auth\provider\*  
						
						... 
						
						
						
						PHPBB3-12715 
						
						
					 
					
						2014-06-15 16:39:28 +02:00