Andreas Fischer 
							
						 
					 
					
						
						
							
						
						19d0c2abd5 
					 
					
						
						
							
							Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop  
						
						... 
						
						
						
						* VSEphpbb/ticket/12248:
  [ticket/12248] Restore id attributes to extension details (used by tests) 
						
						
					 
					
						2014-03-06 23:50:07 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						aae22d699e 
					 
					
						
						
							
							[ticket/12248] Restore id attributes to extension details (used by tests)  
						
						... 
						
						
						
						PHPBB3-12248 
						
						
					 
					
						2014-03-06 12:02:27 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						4b6f3f8b0f 
					 
					
						
						
							
							Merge pull request  #2088  from nickvergessen/ticket/12236  
						
						... 
						
						
						
						Ticket/12236 Convert AOL and Yahoo to custom profile fields 
						
						
					 
					
						2014-03-05 18:44:39 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						9b1b57c649 
					 
					
						
						
							
							Merge pull request  #2080  from nickvergessen/ticket/12243  
						
						... 
						
						
						
						[Ticket/12243] subsilver2 is missing profile field files 
						
						
					 
					
						2014-03-05 18:29:07 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						3ece3223e4 
					 
					
						
						
							
							Merge pull request  #2086  from VSEphpbb/ticket/12248  
						
						... 
						
						
						
						[ticket/12248] Make extension details homepage a clickable link 
						
						
					 
					
						2014-03-05 18:27:29 -06:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						898976f8a1 
					 
					
						
						
							
							[ticket/12248] Remove unused label for attributes and related id tags  
						
						... 
						
						
						
						PHPBB3-12248 
						
						
					 
					
						2014-03-05 15:05:40 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						2e49efc12d 
					 
					
						
						
							
							[ticket/12248] Use id instead of name attribute in a tags  
						
						... 
						
						
						
						PHPBB3-12248 
						
						
					 
					
						2014-03-05 14:54:04 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						4e770c2b42 
					 
					
						
						
							
							[ticket/12248] Fix meta_author tags (IDs must be unique)  
						
						... 
						
						
						
						PHPBB3-12248 
						
						
					 
					
						2014-03-05 14:53:31 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						d0b07503ad 
					 
					
						
						
							
							[ticket/12248] Remove p tag in favor of strong tag  
						
						... 
						
						
						
						PHPBB3-12248 
						
						
					 
					
						2014-03-05 14:45:45 -08: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 
							
						 
					 
					
						
						
							
						
						71354ef185 
					 
					
						
						
							
							[develop] Fix incorrect merge conflict resolution from PR  #2085  
						
						... 
						
						
						
						PHPBB3-12235 
						
						
					 
					
						2014-03-05 11:51:38 +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 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						03492e6211 
					 
					
						
						
							
							[ticket/12248] Make extension details homepage a clickable link  
						
						... 
						
						
						
						http://tracker.phpbb.com/browse/PHPBB3-12248 
PHPBB3-12248 
					
						2014-03-04 15:49:33 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						83a7e632b9 
					 
					
						
						
							
							[ticket/12235] Convert WLM to custom profile field  
						
						... 
						
						
						
						PHPBB3-12235 
						
						
					 
					
						2014-03-04 10:19:08 +01:00 
						 
				 
			
				
					
						
							
							
								hjpotter92 
							
						 
					 
					
						
						
							
						
						c82f59b5ab 
					 
					
						
						
							
							[ticket/12245] Fix id attributes in acp_prune_users.html  
						
						... 
						
						
						
						The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)
PHPBB3-12245 
						
						
					 
					
						2014-03-04 03:41:45 +05:30 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5b1fbfb2f2 
					 
					
						
						
							
							[ticket/12187] Remove user_website functionality  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 20:01:19 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a2f2629e2a 
					 
					
						
						
							
							[ticket/12187] Add URL type for profile fields  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 12:30:07 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						3e52d780ba 
					 
					
						
						
							
							[ticket/12243] Remove outdated adm/style/custom_profile_fields.html  
						
						... 
						
						
						
						PHPBB3-12243 
						
						
					 
					
						2014-03-03 12:16:22 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						50e4cac5de 
					 
					
						
						
							
							[ticket/12126] left:0 and right: 0; admin.css --> width: auto  
						
						... 
						
						
						
						PHPBB3-12126 
						
						
					 
					
						2014-03-02 22:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						f997d98a2a 
					 
					
						
						
							
							[ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"  
						
						... 
						
						
						
						PHPBB3-12126 
						
						
					 
					
						2014-03-02 18:43:31 +01: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 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						4f6b9080e8 
					 
					
						
						
							
							Merge pull request  #2037  from prototech/ticket/12080  
						
						... 
						
						
						
						[ticket/12080] Fix color palettes when responsive. 
						
						
					 
					
						2014-02-20 20:59:14 -06:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						55b38e8003 
					 
					
						
						
							
							[ticket/12200] Add missing profile field template files to adm/style/ directory  
						
						... 
						
						
						
						PHPBB3-12200 
						
						
					 
					
						2014-02-19 22:08:36 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						f43dedb3fd 
					 
					
						
						
							
							[ticket/12153] Replace old template variables with {PAGE_NUMBER}.  
						
						... 
						
						
						
						PHPBB3-12153 
						
						
					 
					
						2014-02-19 13:16:58 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						7015fc8a00 
					 
					
						
						
							
							Merge pull request  #2002  from prototech/ticket/12153  
						
						... 
						
						
						
						[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination() 
						
						
					 
					
						2014-02-18 14:11:48 -06:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						b3ecb9e1e4 
					 
					
						
						
							
							Merge remote-tracking branch 'Zoddo/ticket/12003' into develop  
						
						... 
						
						
						
						* Zoddo/ticket/12003:
  [ticket/12003] ACP broken when error thrown 
						
						
					 
					
						2014-02-17 10:27:23 -08:00 
						 
				 
			
				
					
						
							
							
								Zoddo 
							
						 
					 
					
						
						
							
						
						b942615c3b 
					 
					
						
						
							
							[ticket/12003] ACP broken when error thrown  
						
						... 
						
						
						
						Fix display of ACP when error is outputted before <html> tag.
PHPBB3-12003 
						
						
					 
					
						2014-02-17 19:21:20 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						b8c836836b 
					 
					
						
						
							
							[ticket/12080] Stop responsive ACP sig textarea from dropping to second line.  
						
						... 
						
						
						
						PHPBB3-12080 
						
						
					 
					
						2014-02-16 13:27:48 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						bfbf0fefbf 
					 
					
						
						
							
							[ticket/12080] Reduce the palette options in all locations when responsive.  
						
						... 
						
						
						
						PHPBB3-12080 
						
						
					 
					
						2014-02-16 13:27:01 -08: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 
							
						 
					 
					
						
						
							
						
						6bee91c429 
					 
					
						
						
							
							[ticket/12169] Convert user_from to profile field location  
						
						... 
						
						
						
						Missing changes on memberlist view due to missing functionality
PHPBB3-12169 
						
						
					 
					
						2014-02-10 14:38:43 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						bbada27ee9 
					 
					
						
						
							
							[ticket/12115] Also port user interests to profile fields  
						
						... 
						
						
						
						PHPBB3-12115 
						
						
					 
					
						2014-02-06 11:32:11 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						38608bfa62 
					 
					
						
						
							
							[ticket/12115] Remove occupation field from html files  
						
						... 
						
						
						
						PHPBB3-12115 
						
						
					 
					
						2014-02-06 11:32:07 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						1251b68668 
					 
					
						
						
							
							[ticket/12153] Remove redundant calls to pagination.on_page().  
						
						... 
						
						
						
						PHPBB3-12153 
						
						
					 
					
						2014-02-03 23:00:39 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						f22e51c8a1 
					 
					
						
						
							
							[ticket/12153] Remove vars already assigned in generate_template_pagination().  
						
						... 
						
						
						
						PHPBB3-12153 
						
						
					 
					
						2014-02-03 23:00:34 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						ad2d1fcbcb 
					 
					
						
						
							
							Merge pull request  #1942  from nickvergessen/ticket/11996  
						
						... 
						
						
						
						[ticket/11996] Add explanation how to correctly remove and update an extension 
						
						
					 
					
						2014-02-03 11:49:24 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						8620f1e619 
					 
					
						
						
							
							[ticket/12125] Specify nth-child selectors separately - IE8 does not like them  
						
						... 
						
						
						
						PHPBB3-12125 
						
						
					 
					
						2014-01-24 04:30:14 -08:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						57088e3b26 
					 
					
						
						
							
							[ticket/12011] Align ACP tabs to the right and separate ACP content from menu.  
						
						... 
						
						
						
						PHPBB3-12011 
						
						
					 
					
						2014-01-17 19:15:38 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						8486d6a9d1 
					 
					
						
						
							
							Merge pull request  #1938  from prototech/ticket/12077  
						
						... 
						
						
						
						[ticket/12077] Ensure that valid upload methods are presented to user in language packs page. 
						
						
					 
					
						2014-01-17 18:28:19 -08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						b155056cb9 
					 
					
						
						
							
							[ticket/11996] Use a table for better styling  
						
						... 
						
						
						
						PHPBB3-11996 
						
						
					 
					
						2014-01-13 10:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						b186d31ce6 
					 
					
						
						
							
							Merge pull request  #1920  from prototech/ticket/12038  
						
						... 
						
						
						
						[ticket/12038] AJAXify move up/down buttons for various ACP pages. 
						
						
					 
					
						2013-12-30 11:23:22 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						34c3e74c16 
					 
					
						
						
							
							Merge pull request  #1913  from prototech/ticket/12055  
						
						... 
						
						
						
						[ticket/12055] Alternate table row background colors using nth-child rule. 
						
						
					 
					
						2013-12-30 10:44:30 -08: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 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						558f3cd21c 
					 
					
						
						
							
							Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop  
						
						... 
						
						
						
						* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ... 
						
						
					 
					
						2013-12-20 16:11:02 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						9db8665a54 
					 
					
						
						
							
							[ticket/12077] Add missing space after template block name.  
						
						... 
						
						
						
						PHPBB3-12077 
						
						
					 
					
						2013-12-19 17:15:15 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						31eb759aa4 
					 
					
						
						
							
							[ticket/12060] Use separate template event for acp user signature posting buttons  
						
						... 
						
						
						
						PHPBB3-12060 
						
						
					 
					
						2013-12-13 13:36:59 -08:00 
						 
				 
			
				
					
						
							
							
								Matt Friedman 
							
						 
					 
					
						
						
							
						
						8864c601a2 
					 
					
						
						
							
							[ticket/12060] Rename event from append to after in acp_bbcodes.html  
						
						... 
						
						
						
						PHPBB3-12060 
						
						
					 
					
						2013-12-13 13:34:58 -08:00