Nathaniel Guse 
							
						 
					 
					
						
						
							
						
						b5651c0289 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop  
						
						... 
						
						
						
						# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [ticket/11626] Make identifier uppercase per style requirements
  [ticket/11626] Change the identifier template file in the template
  [ticket/11626] Call method only one time per provider
  [ticket/11626] Change interface to match functionality
  [ticket/11626] Include the template file in acp_board
  [ticket/11626] LDAP Auth ACP Template File
  [ticket/11626] Create get_acp_template method for auth providers 
						
						
					 
					
						2013-07-12 14:59:43 -05:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						631ce22f2c 
					 
					
						
						
							
							[ticket/11626] Remove LDAP dependency on template  
						
						... 
						
						
						
						Returns template vars rather than requiring the template.
PHPBB3-11626 
						
						
					 
					
						2013-07-12 15:54:41 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						f4f29a1c0a 
					 
					
						
						
							
							[feature/auth-refactor] Fix style issue  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-07-11 17:43:53 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						a64a042830 
					 
					
						
						
							
							[feature/auth-refactor] Fix typo  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-07-11 17:39:51 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						f24a8e5b81 
					 
					
						
						
							
							[ticket/11626] Make identifier uppercase per style requirements  
						
						... 
						
						
						
						PHPBB3-11626 
						
						
					 
					
						2013-07-11 15:49:46 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						3465867a4e 
					 
					
						
						
							
							[ticket/11626] Change the identifier template file in the template  
						
						... 
						
						
						
						PHPBB3-11626 
						
						
					 
					
						2013-07-11 15:49:45 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						3431cb8ed7 
					 
					
						
						
							
							[ticket/11626] Call method only one time per provider  
						
						... 
						
						
						
						PHPBB3-11626 
						
						
					 
					
						2013-07-11 15:49:45 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						60100b62f3 
					 
					
						
						
							
							[ticket/11626] Change interface to match functionality  
						
						... 
						
						
						
						Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().
PHPBB3-11626 
						
						
					 
					
						2013-07-11 15:49:45 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						29b472c2e5 
					 
					
						
						
							
							[ticket/11626] Include the template file in acp_board  
						
						... 
						
						
						
						PHPBB3-11626 
						
						
					 
					
						2013-07-11 15:49:45 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						9c0495664d 
					 
					
						
						
							
							[feature/auth-refactor] Remove invalid providers from acp select  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-07-11 15:46:08 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						e2435f25d9 
					 
					
						
						
							
							[feature/auth-refactor] Check that providers implement auth interface  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-07-11 14:54:52 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						f9672e9b45 
					 
					
						
						
							
							[feature/auth-refactor] Fix code style issue  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-07-02 14:03:43 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						4afdd650cd 
					 
					
						
						
							
							[feature/auth-refactor] Removed no longer used variable  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-06-26 00:02:20 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						59929669f5 
					 
					
						
						
							
							[feature/auth-refactor] Fix errors in acp_board  
						
						... 
						
						
						
						Fixes errors introduced by the last several commits.
PHPBB3-9734 
						
						
					 
					
						2013-06-25 22:27:16 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						08614e2b85 
					 
					
						
						
							
							[feature/auth-refactor] Fix indentation on acp_board  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-06-25 22:26:03 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						3c394aee62 
					 
					
						
						
							
							[feature/auth-refactor] Refactor auth in acp_board  
						
						... 
						
						
						
						Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.
PHPBB3-9734 
						
						
					 
					
						2013-06-25 22:21:38 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						b78b6711c8 
					 
					
						
						
							
							[feature/auth-refactor] Don't truncate name then reattach same thing  
						
						... 
						
						
						
						PHPBB3-9734 
						
						
					 
					
						2013-06-25 22:15:21 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						4f3f0a8791 
					 
					
						
						
							
							[feature/auth-refactor] Remove references to old auth plugins  
						
						... 
						
						
						
						Removes what is hopefully the last references to the old auth
plugins in the code base.
PHPBB3-9734 
						
						
					 
					
						2013-06-25 21:59:19 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						b8610c4b98 
					 
					
						
						
							
							[feature/auth-refactor] Refactor code to use services  
						
						... 
						
						
						
						Refactors all loading of auth providers to use services instead of
directly calling the class.
PHPBB3-9734 
						
						
					 
					
						2013-06-21 18:04:11 -04:00 
						 
				 
			
				
					
						
							
							
								Joseph Warner 
							
						 
					 
					
						
						
							
						
						2445766b92 
					 
					
						
						
							
							[feature/auth-refactor] Refactor acp_board for new auth interface  
						
						... 
						
						
						
						Partially refactors acp_board for the new authentication interface.
Leaves some questionable if statements in the file.
Modifies the interface to correctly impletment the acp() method.
Modifies each provider to comply with the above mentioned interface
modification.
PHPBB3-9734 
						
						
					 
					
						2013-06-19 15:02:34 -04:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						721bc03b2b 
					 
					
						
						
							
							[ticket/11010] properly tabifying 'max_autologin_time'  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-21 11:57:33 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						930f4c70ed 
					 
					
						
						
							
							[ticket/11010] resolving latest comments  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-21 11:55:45 +02:00 
						 
				 
			
				
					
						
							
							
								Vjacheslav Trushkin 
							
						 
					 
					
						
						
							
						
						3e64c1b5d7 
					 
					
						
						
							
							[ticket/11010] Fixes for number input in acp  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:42:11 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						3547b9738a 
					 
					
						
						
							
							[ticket/11010] validation to match type  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:42:02 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						6c0f3513d9 
					 
					
						
						
							
							[ticket/11010] replacing maxlenght with max  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:41:32 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						f75aa97282 
					 
					
						
						
							
							[ticket/11010] adding type="url" to 'site_home_url'  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:40:05 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						49c1e0e348 
					 
					
						
						
							
							[ticket/11010] adding type="number" in ACP; adding type="email" in install  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:39:44 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						4fe7ba5daf 
					 
					
						
						
							
							[ticket/11010] changing email and url input types in php files  
						
						... 
						
						
						
						PHPBB3-11010 
						
						
					 
					
						2013-05-20 18:34:28 +02:00 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						1a51abcca2 
					 
					
						
						
							
							[ticket/10325] change language var  
						
						... 
						
						
						
						PHPBB3-10325 
						
						
					 
					
						2013-04-25 21:01:14 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						5de14b940e 
					 
					
						
						
							
							[ticket/10325] add allow forgot password option in acp  
						
						... 
						
						
						
						PHPBB3-10325 
						
						
					 
					
						2013-04-25 20:39:49 +05:30 
						 
				 
			
				
					
						
							
							
								Tabitha Backoff 
							
						 
					 
					
						
						
							
						
						a8f5695666 
					 
					
						
						
							
							Migration file and change board_home_text to board_index_text  
						
						
						
						
					 
					
						2013-03-28 17:53:14 -04:00 
						 
				 
			
				
					
						
							
							
								Tabitha Backoff 
							
						 
					 
					
						
						
							
						
						9e5cde7f66 
					 
					
						
						
							
							Ticket# 11477 - Allow customisation of "Board index"  
						
						
						
						
					 
					
						2013-03-28 02:34:36 -04:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						d26ad8ed26 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/phpbb/phpbb3  into feature/avatars  
						
						... 
						
						
						
						Conflicts:
	phpBB/install/database_update.php 
						
						
					 
					
						2013-03-04 00:22:15 +01:00 
						 
				 
			
				
					
						
							
							
								Nathaniel Guse 
							
						 
					 
					
						
						
							
						
						a01da0c1ee 
					 
					
						
						
							
							Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103  
						
						... 
						
						
						
						Conflicts:
	phpBB/install/database_update.php 
						
						
					 
					
						2013-02-26 15:32:27 -06:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						5361a14c1e 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP
Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php 
						
						
					 
					
						2013-02-24 17:42:14 +01:00 
						 
				 
			
				
					
						
							
							
								David Tobin 
							
						 
					 
					
						
						
							
						
						293b65e3ef 
					 
					
						
						
							
							[ticket/10896] Adds email validation to email settings in ACP  
						
						... 
						
						
						
						Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.
PHPBB3-10896 
						
						
					 
					
						2013-02-04 23:10:10 -06:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						9e001153d6 
					 
					
						
						
							
							[feature/avatars] Pass phpbb_user object to prepare_form_acp()  
						
						... 
						
						
						
						The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.
PHPBB3-10018 
						
						
					 
					
						2013-01-08 15:42:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						8867cb60b1 
					 
					
						
						
							
							[feature/avatars] Use empty() instead of sizeof()  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2013-01-07 21:16:39 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						fb139a8820 
					 
					
						
						
							
							[feature/avatars] Fix behavior of avatar manager and variables  
						
						... 
						
						
						
						The $force_all variable was only partially removed and the behavior was
not consistent in all files.
PHPBB3-10018 
						
						
					 
					
						2012-12-04 15:12:04 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						fc4069f81d 
					 
					
						
						
							
							[feature/avatars] Use seperate function for retrieving all drivers  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-12-04 00:59:37 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						081440f6c4 
					 
					
						
						
							
							[feature/avatars] Create setting for enabling avatar in manager  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-11-30 23:11:44 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						33b98dc5ba 
					 
					
						
						
							
							[feature/avatars] Fix variable names  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-11-30 16:46:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						f4ad60e2cf 
					 
					
						
						
							
							[feature/avatars] Get list of enabled drivers from avatar manager  
						
						... 
						
						
						
						This shouldn't be done in the avatar drivers. We need to force the
display all avatar drivers in the ACP or it won't be possible to enable
avatars after they have been disabled.
PHPBB3-10018 
						
						
					 
					
						2012-11-30 01:07:10 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						67c2e48d15 
					 
					
						
						
							
							[feature/avatars] Only create avatar objects if necessary  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-11-25 14:33:13 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						726d1a16d7 
					 
					
						
						
							
							[feature/avatars] Move avatar specific settings to drivers  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-11-21 17:15:35 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						ca30135391 
					 
					
						
						
							
							[feature/avatars] Add gravatar to avatar settings  
						
						... 
						
						
						
						PHPBB3-10018 
						
						
					 
					
						2012-11-16 22:59:29 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						0bab8ff777 
					 
					
						
						
							
							[ticket/11103] ACP option to enable/disable notifications output in header  
						
						... 
						
						
						
						PHPBB3-11103 
						
						
					 
					
						2012-10-05 13:43:03 -05:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						a5dd64195a 
					 
					
						
						
							
							[ticket/11021] Add the option to specify a Site home URL and text  
						
						... 
						
						
						
						PHPBB3-11021 
						
						
					 
					
						2012-07-22 22:26:38 -05:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7df1c84447 
					 
					
						
						
							
							[feature/new-tz-handling] Don't use global user but make it a parameter  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-07-19 17:41:27 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						196e634370 
					 
					
						
						
							
							[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid  
						
						... 
						
						
						
						This should avoid problems, when the board files are updated but database isn't.
PHPBB3-9558 
						
						
					 
					
						2012-07-19 15:46:12 +02:00