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
..
acp	Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop	2014-03-05 11:49:11 +01:00
email	Merge branch 'develop-olympus' into develop	2013-11-19 15:28:37 +01:00
mods	[feature/sphinx-fulltext-search] integrate sphinx language keys with core	2012-07-12 17:31:49 +05:30
app.php	[feature/controller] Remove unused language strings	2012-11-18 15:51:32 -05:00
captcha_qa.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
captcha_recaptcha.php	[ticket/9975] Moved a few E_USER_ERROR errors to /language	2013-04-23 09:55:36 -07:00
common.php	Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop	2014-03-05 11:49:11 +01:00
groups.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
help_bbcode.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
help_faq.php	Merge branch 'develop-olympus' into develop	2013-07-25 14:08:06 +02:00
index.htm	ISO	2002-10-04 12:40:07 +00:00
install.php	[ticket/11574] Remove install/udpate/new/ fallback from database_update.php	2013-07-30 01:38:06 +02:00
iso.txt	#10549	2007-05-13 22:20:30 +00:00
mcp.php	[ticket/9657] Fix english language :(	2013-07-11 22:46:34 -04:00
memberlist.php	[ticket/12235] Convert WLM to custom profile field	2014-03-04 10:19:08 +01:00
migrator.php	[ticket/11883] Report completed data step in migration as "Installing Data"	2013-10-02 14:27:46 -05:00
plupload.php	[ticket/12206] Fix mismatched Plupload language vars preventing localization.	2014-02-17 12:33:19 -08:00
posting.php	[ticket/11894] Fix typo in "Delete post" option	2013-10-05 20:59:07 -07:00
search.php	[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.	2014-01-16 11:48:40 -08:00
search_ignore_words.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
search_synonyms.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp.php	Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop	2014-03-05 11:49:11 +01:00
viewforum.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
viewtopic.php	[ticket/12187] Remove user_website functionality	2014-03-03 20:01:19 +01:00