Marc Alexander 
							
						 
					 
					
						
						
							
						
						6f92996d98 
					 
					
						
						
							
							[ticket/12159] Fix codesniffer complaints due to profilefields and passwords  
						
						... 
						
						
						
						The two PRs regarding profilefields and passwords manager that were recently
merged caused a few codesniffer complaints that are fixed by these changes.
PHPBB3-12159 
						
						
					 
					
						2014-02-03 22:25:43 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						2c878ead31 
					 
					
						
						
							
							[ticket/11880] Break up schema changes in the migrator  
						
						... 
						
						
						
						PHPBB3-11880 
						
						
					 
					
						2014-02-03 15:07:57 -06:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						2c9e6f196b 
					 
					
						
						
							
							[ticket/12156] Add missing passwords manager to oauth  
						
						... 
						
						
						
						PHPBB3-12156 
						
						
					 
					
						2014-02-03 18:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						455d55d497 
					 
					
						
						
							
							[ticket/11716] Convert Soft Delete Mod to post/topic visibility  
						
						... 
						
						
						
						PHPBB3-11716 
						
						
					 
					
						2014-02-03 09:45:33 -06:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						38af79dd30 
					 
					
						
						
							
							Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop  
						
						... 
						
						
						
						* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...
Conflicts:
	phpBB/config/services.yml 
						
						
					 
					
						2014-02-02 16:34:55 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						cbad102f88 
					 
					
						
						
							
							[ticket/11201] Split template file into multiple files  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-02-02 16:20:02 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						cacd43bfbd 
					 
					
						
						
							
							[ticket/11201] Remove dependency from types on the manager  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-02-02 16:13:04 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						f8d6a07392 
					 
					
						
						
							
							Merge pull request  #1716  from marc1706/feature/passwords  
						
						... 
						
						
						
						[feature/passwords] Add password hashing manager with support for newer hashing algorithms 
						
						
					 
					
						2014-02-02 06:26:35 -08:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b094c79996 
					 
					
						
						
							
							[feature/passwords] Move combined hashing methods to manager  
						
						... 
						
						
						
						This will get rid of the circular dependency between the passwords manager
and the passwords helper. The combined_hash_password() method was also
slightly changed to allow both the definitions of service names or prefixes
for the hash types.
PHPBB3-11610 
						
						
					 
					
						2014-02-02 14:57:43 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						cb04252fbd 
					 
					
						
						
							
							Merge remote-tracking branch 'vsephpbb/ticket/12100' into develop  
						
						
						
						
					 
					
						2014-02-02 14:48:14 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						08a8bd8e6f 
					 
					
						
						
							
							[feature/passwords] Add support for passwords driver service name in hash()  
						
						... 
						
						
						
						This will allow users to specify both the hash type by prefix and by its
service name.
PHPBB3-11610 
						
						
					 
					
						2014-02-02 14:13:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						292961a277 
					 
					
						
						
							
							[feature/passwords] Get rid of set_name/get_name methods for passwords drivers  
						
						... 
						
						
						
						PHPBB3-11610 
						
						
					 
					
						2014-02-02 14:09:09 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7bcbdfc1b1 
					 
					
						
						
							
							[ticket/11201] Rename profilefields class to manager  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-02-02 12:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						514a59ffa7 
					 
					
						
						
							
							[ticket/11201] Fix parameter description  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-02-02 12:39:21 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						d3ce584dc7 
					 
					
						
						
							
							[ticket/12100] Re-order arguments in template environment constructor  
						
						... 
						
						
						
						PHPBB3-12100 
						
						
					 
					
						2014-01-27 20:38:15 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						75c54f7f5e 
					 
					
						
						
							
							[ticket/12100] Ensure enabled extensions are fresh in Twig environment  
						
						... 
						
						
						
						PHPBB3-12100 
						
						
					 
					
						2014-01-27 18:51:39 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						ff9e16950b 
					 
					
						
						
							
							[ticket/12123] Add soft delete to phpbb/permissions.php.  
						
						... 
						
						
						
						PHPBB3-12123 
						
						
					 
					
						2014-01-25 16:22:01 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						430a0c1c21 
					 
					
						
						
							
							[ticket/11201] Also translate profile fields in UCP and ACP  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-19 17:58:12 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						4213b93cde 
					 
					
						
						
							
							[ticket/11201] Add parameters and variables to profile field class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-19 15:00:26 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						ec8fd57f28 
					 
					
						
						
							
							[ticket/11201] Add commas on last array entry  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-19 14:55:47 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						0ce98d7eac 
					 
					
						
						
							
							[ticket/11201] Allow translation of profile field name and explanation  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-19 14:52:51 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f40f774b2e 
					 
					
						
						
							
							[ticket/11201] Fix some variable names  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 13:28:17 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						197e026699 
					 
					
						
						
							
							[ticket/11201] Add a method to return the translated full name of the type  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 13:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						df85364baa 
					 
					
						
						
							
							[ticket/11201] Remove db depending code from field class  
						
						... 
						
						
						
						sql_build_array() should already take care of that
PHPBB3-11201 
						
						
					 
					
						2014-01-18 13:01:29 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						b1bed49eae 
					 
					
						
						
							
							[ticket/11201] Add variables to classes and add constructor doc blocks  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:53:41 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7fac238398 
					 
					
						
						
							
							[ticket/11201] Update copyright in class file  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:47:19 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7a8818fbc6 
					 
					
						
						
							
							[ticket/11201] Add visibility and remove unused variable  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:46:48 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						1c884d07eb 
					 
					
						
						
							
							[ticket/11201] Add some commas at the last array entry  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:44:24 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						876e5e5fbb 
					 
					
						
						
							
							[ticket/11201] Cast some variables to integer  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:40:12 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						431fa7b593 
					 
					
						
						
							
							[ticket/11201] Inject table names rather then using constants  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-18 12:36:18 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						574eb2c199 
					 
					
						
						
							
							Merge pull request  #1947  from bantu/ticket/12107  
						
						... 
						
						
						
						[ticket/12107] Use log table property instead of log table constant. 
						
						
					 
					
						2014-01-17 17:57:06 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						6ae6dceb47 
					 
					
						
						
							
							Merge pull request  #1950  from prototech/ticket/12096  
						
						... 
						
						
						
						[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE. 
						
						
					 
					
						2014-01-17 17:55:00 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						aa2f0a652f 
					 
					
						
						
							
							[ticket/11201] Change type from integer to service name  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 21:13:59 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						74d36591e1 
					 
					
						
						
							
							[ticket/11201] Move custom template variable assignment to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 21:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						af5c747f6f 
					 
					
						
						
							
							[ticket/11201] Move preparation of hidden fields to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 21:13:46 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						67f477fc8f 
					 
					
						
						
							
							[ticket/11201] Allow manipulating the intended variables with the type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 13:59:07 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						ae38cfaa70 
					 
					
						
						
							
							[ticket/11201] Move type specific error messages to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 10:20:00 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5e2ffe0d5c 
					 
					
						
						
							
							[ticket/11201] Add abstract base class with shared methods  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 10:12:30 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						9653764fb1 
					 
					
						
						
							
							[ticket/11201] Move field type depending preparation of the options to class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-17 09:55:52 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						4bb05c74e5 
					 
					
						
						
							
							[ticket/12032] Do not inherit read status in certain notifications.  
						
						... 
						
						
						
						PHPBB3-12032 
						
						
					 
					
						2014-01-16 17:27:30 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						b3a25c52e5 
					 
					
						
						
							
							[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.  
						
						... 
						
						
						
						PHPBB3-12096 
						
						
					 
					
						2014-01-16 11:48:40 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						0bdec35cd4 
					 
					
						
						
							
							[ticket/11201] Move grabbing the input of the language options to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-16 16:00:52 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						78603bb96d 
					 
					
						
						
							
							[ticket/11201] Move language option determination into type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-15 18:25:28 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7d2d18fb50 
					 
					
						
						
							
							[ticket/11201] Move "get type" code into a new function  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-15 16:37:21 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						8e86e56120 
					 
					
						
						
							
							[ticket/11201] Add database column type to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-15 16:36:50 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						1dbc2d6218 
					 
					
						
						
							
							[ticket/11201] Fix dropdown tests  
						
						... 
						
						
						
						The error message is now already the language string including the fieldname
and not the language key anymore.
PHPBB3-11201 
						
						
					 
					
						2014-01-15 12:36:54 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7fd5f16fa2 
					 
					
						
						
							
							[ticket/11201] Use a service collection for the types instead of the container  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-15 12:16:04 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5df7f76e6b 
					 
					
						
						
							
							[ticket/11201] Split language options into a new class  
						
						... 
						
						
						
						Otherwise we run into a circular dependency
PHPBB3-11201 
						
						
					 
					
						2014-01-15 12:15:41 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						cd6bdc7b27 
					 
					
						
						
							
							[ticket/11201] Remove remaining type depending code to type class  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-14 15:08:33 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						9dec023632 
					 
					
						
						
							
							[ticket/11201] Add visibility to methods  
						
						... 
						
						
						
						PHPBB3-11201 
						
						
					 
					
						2014-01-14 13:42:18 +01:00