Cesar G 
							
						 
					 
					
						
						
							
						
						55a674adcf 
					 
					
						
						
							
							Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeus  
						
						... 
						
						
						
						* nickvergessen/ticket/8700:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings 
						
						
					 
					
						2014-04-09 17:22:00 -07:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						b6128dee3f 
					 
					
						
						
							
							[ticket/8700] Use L_COLON instead of adding ":" manually  
						
						... 
						
						
						
						PHPBB3-8700 
						
						
					 
					
						2014-04-02 00:23:26 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						bdc08a3fcd 
					 
					
						
						
							
							[ticket/8700] Remove unused language strings  
						
						... 
						
						
						
						Most of the strings were obsoleted by the removal of:
* Imagesets
* Themes
* Templates
* Editor
* Exporter
PHPBB3-8700 
						
						
					 
					
						2014-04-02 00:17:39 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						d83d819827 
					 
					
						
						
							
							[ticket/12150] Use shorter column names for prune settings  
						
						... 
						
						
						
						All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.
PHPBB3-12150 
						
						
					 
					
						2014-03-29 22:14:58 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						02fdae4e88 
					 
					
						
						
							
							[ticket/12150] Add file and caller for pruning shadow topics  
						
						... 
						
						
						
						PHPBB3-12150 
						
						
					 
					
						2014-03-29 21:56:53 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						3c7ff1c417 
					 
					
						
						
							
							[ticket/12150] Add options to acp  
						
						... 
						
						
						
						PHPBB3-12150 
						
						
					 
					
						2014-03-29 21:49:31 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						e2c2692e9c 
					 
					
						
						
							
							[ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php  
						
						... 
						
						
						
						PHPBB3-12315 
						
						
					 
					
						2014-03-28 11:27:25 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						368dd23d4b 
					 
					
						
						
							
							[ticket/12311] Use British-English spelling of licence in lang file  
						
						... 
						
						
						
						PHPBB3-12311 
						
						
					 
					
						2014-03-28 09:08:11 -07:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						ba9bc9c7dc 
					 
					
						
						
							
							[ticket/12311] Use valid composer schema - license - for extensions  
						
						... 
						
						
						
						http://tracker.phpbb.com/browse/PHPBB3-12311 
PHPBB3-12311 
					
						2014-03-27 23:27:30 -07:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						800c779403 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop-ascraeus  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP 
						
						
					 
					
						2014-03-24 20:58:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Schosser 
							
						 
					 
					
						
						
							
						
						a46ad06c19 
					 
					
						
						
							
							[ticket/10174] Rename "Ban usernames" to "Ban users" in ACP  
						
						... 
						
						
						
						Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself
PHPBB3-10174 
						
						
					 
					
						2014-03-23 14:06:32 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						3845a560b6 
					 
					
						
						
							
							[ticket/11904] Update explanation for what Allow CDN does  
						
						... 
						
						
						
						PHPBB3-11904 
						
						
					 
					
						2014-03-16 15:55:58 -07:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						0c02eae1ad 
					 
					
						
						
							
							[ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php  
						
						... 
						
						
						
						PHPBB3-11787 
						
						
					 
					
						2014-03-13 20:58:05 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						4ecfc07e03 
					 
					
						
						
							
							Merge pull request  #2113  from nickvergessen/ticket/8041  
						
						... 
						
						
						
						[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations 
						
						
					 
					
						2014-03-13 11:02:29 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						dbebe30c9a 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
Conflicts:
	tests/test_framework/phpbb_functional_test_case.php 
						
						
					 
					
						2014-03-13 10:27:19 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						03eb23cbae 
					 
					
						
						
							
							Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus  
						
						... 
						
						
						
						* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message. 
						
						
					 
					
						2014-03-13 10:16:41 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						c6a87e77d4 
					 
					
						
						
							
							Merge remote-tracking branch 'vsephpbb/ticket/12244' into develop  
						
						... 
						
						
						
						* vsephpbb/ticket/12244:
  [ticket/12244] Rename extensions manager tab
  [ticket/12244] Rename link to Extensions Manager in the ACP 
						
						
					 
					
						2014-03-12 20:18:29 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						9419edd686 
					 
					
						
						
							
							[ticket/8041] Merge item name into "Return to" string for better translations  
						
						... 
						
						
						
						PHPBB3-8041 
						
						
					 
					
						2014-03-12 01:05:05 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						9b1620911d 
					 
					
						
						
							
							[ticket/12244] Rename extensions manager tab  
						
						... 
						
						
						
						PHPBB3-12244 
						
						
					 
					
						2014-03-11 08:36:51 -07:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						052bbf654f 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop  
						
						... 
						
						
						
						* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board
Conflicts:
	phpBB/language/en/acp/board.php 
						
						
					 
					
						2014-03-10 21:51:07 -05:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						957e9aabc3 
					 
					
						
						
							
							[ticket/12106] Combined first and second sentence  
						
						... 
						
						
						
						PHPBB3-12106 
						
						
					 
					
						2014-03-10 21:19:25 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						13327a13a0 
					 
					
						
						
							
							[ticket/12106] Adds a explaination that admin/mods still able to use the board  
						
						... 
						
						
						
						PHPBB3-12106 
						
						
					 
					
						2014-03-10 18:50:39 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						600e5f6c11 
					 
					
						
						
							
							[ticket/12251] Add string validation for a-zA-Z0-9 and underscore  
						
						... 
						
						
						
						PHPBB3-12251 
						
						
					 
					
						2014-03-06 12:28:36 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f2059f52f3 
					 
					
						
						
							
							[ticket/12236] Move AOL Instant Messanger field to custom profile field  
						
						... 
						
						
						
						PHPBB3-12236 
						
						
					 
					
						2014-03-05 22:13:22 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						2e5106aae1 
					 
					
						
						
							
							[ticket/12237] Convert yahoo messanger to custom profile field  
						
						... 
						
						
						
						PHPBB3-12237 
						
						
					 
					
						2014-03-05 21:38:57 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						0e35a85155 
					 
					
						
						
							
							Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop  
						
						... 
						
						
						
						* github-nickvergessen/ticket/12235:
  [ticket/12235] Convert WLM to custom profile field
  [ticket/12187] Do not make clickable when using as contact field
  [ticket/12187] Split generate_profile_fields_template() into 2 methods
  [ticket/12187] Remove user_website field
  [ticket/12187] Remove user_website functionality
  [ticket/12187] Convert website field data to custom profile field
  [ticket/12187] Add URL type for profile fields
  [ticket/12234] Replace ICQ with custom profile field
  [ticket/12233] Update schema file
  [ticket/12233] Add images back to subsilver2
  [ticket/12233] Allow profile fields to be contact fields
Conflicts:
	phpBB/adm/style/acp_prune_users.html 
						
						
					 
					
						2014-03-05 11:49:11 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						83a7e632b9 
					 
					
						
						
							
							[ticket/12235] Convert WLM to custom profile field  
						
						... 
						
						
						
						PHPBB3-12235 
						
						
					 
					
						2014-03-04 10:19:08 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5b1fbfb2f2 
					 
					
						
						
							
							[ticket/12187] Remove user_website functionality  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 20:01:19 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						321d430dba 
					 
					
						
						
							
							[ticket/12244] Rename link to Extensions Manager in the ACP  
						
						... 
						
						
						
						PHPBB3-12244 
						
						
					 
					
						2014-03-03 08:21:01 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a2f2629e2a 
					 
					
						
						
							
							[ticket/12187] Add URL type for profile fields  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 12:30:07 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						87fa7b98cc 
					 
					
						
						
							
							[ticket/11645] Rename .MODs tab in ACP to Extensions  
						
						... 
						
						
						
						http://tracker.phpbb.com/browse/PHPBB3-11645 
PHPBB3-11645 
					
						2014-03-02 11:58:26 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						76409388af 
					 
					
						
						
							
							[ticket/12234] Replace ICQ with custom profile field  
						
						... 
						
						
						
						PHPBB3-12234 
						
						
					 
					
						2014-02-28 15:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a823205403 
					 
					
						
						
							
							[ticket/12233] Allow profile fields to be contact fields  
						
						... 
						
						
						
						Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages
PHPBB3-12233 
						
						
					 
					
						2014-02-28 14:38:03 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						8960e6d777 
					 
					
						
						
							
							[ticket/12176] Display correct message when trying to delete founder.  
						
						... 
						
						
						
						PHPBB3-12176 
						
						
					 
					
						2014-02-15 02:27:54 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						995019a992 
					 
					
						
						
							
							[ticket/12169] Add new option to display profile fields on memberlist  
						
						... 
						
						
						
						PHPBB3-12169 
						
						
					 
					
						2014-02-10 16:28:21 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						c7f6cccdf1 
					 
					
						
						
							
							[ticket/11996] Remove note until we really do disable the board  
						
						... 
						
						
						
						PHPBB3-11996 
						
						
					 
					
						2014-02-03 20:48:01 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						b155056cb9 
					 
					
						
						
							
							[ticket/11996] Use a table for better styling  
						
						... 
						
						
						
						PHPBB3-11996 
						
						
					 
					
						2014-01-13 10:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						95d4e6aa97 
					 
					
						
						
							
							[ticket/11996] Add explanation how to correctly remove and update an extension  
						
						... 
						
						
						
						See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001  for more
information about the decision.
PHPBB3-11996 
						
						
					 
					
						2013-12-27 15:25:03 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						bef7bc7900 
					 
					
						
						
							
							[ticket/11911] Warn admins when there is no search index for the selected engine  
						
						... 
						
						
						
						PHPBB3-11911 
						
						
					 
					
						2013-12-27 13:16:38 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						c42bd28d17 
					 
					
						
						
							
							[ticket/12009] Prevent user from enabling invalid extension through direct URL  
						
						... 
						
						
						
						PHPBB3-12009 
						
						
					 
					
						2013-12-12 14:40:03 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5d69eddcf5 
					 
					
						
						
							
							[ticket/12045] Only display group selection if there are groups  
						
						... 
						
						
						
						Also fixed the empty option which is not allowed.
PHPBB3-12045 
						
						
					 
					
						2013-11-28 13:22:25 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						05c97fd03c 
					 
					
						
						
							
							[ticket/11994] Fix more language  
						
						... 
						
						
						
						PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f8e92efc3f 
					 
					
						
						
							
							[ticket/11994] Rename "uninstall" to "delete data"  
						
						... 
						
						
						
						PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:20:00 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7e1a02b3a1 
					 
					
						
						
							
							[ticket/11994] Make install/enable just one UI thing  
						
						... 
						
						
						
						PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:19:59 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						3ac3688a7f 
					 
					
						
						
							
							[ticket/11994] Fix some language  
						
						... 
						
						
						
						PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:19:57 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						7bc6f32100 
					 
					
						
						
							
							[ticket/11994] More language fixes  
						
						... 
						
						
						
						PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:19:55 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						8d5fcc8d4c 
					 
					
						
						
							
							[ticket/11994] Make extension manager UI less misleading  
						
						... 
						
						
						
						Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.
PHPBB3-11994 
						
						
					 
					
						2013-11-08 01:19:54 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						6fce4b44a8 
					 
					
						
						
							
							[ticket/11935] Fix <p> tags not allowed inside <strong> tags  
						
						... 
						
						
						
						PHPBB3-11935 
						
						
					 
					
						2013-10-19 08:47:12 -07:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						67530d132a 
					 
					
						
						
							
							[feature/plupload/cron] Add cronjob for cleaning plupload temporary directory.  
						
						... 
						
						
						
						PHPBB3-10929 
						
						
					 
					
						2013-10-11 15:48:04 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						94b49d8a92 
					 
					
						
						
							
							[ticket/11703] Make jQuery CDN switch more generic.  
						
						... 
						
						
						
						Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN
PHPBB3-11703 
						
						
					 
					
						2013-10-10 23:26:03 +02:00