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
..
info	[ticket/12005] Remove PM popup UCP module	2013-11-08 21:57:06 +01:00
ucp_activate.php	[ticket/11746] Delete the notification after user is approved & fix language.	2013-10-26 01:01:08 -07:00
ucp_attachments.php	[ticket/12153] Remove redundant calls to pagination.on_page().	2014-02-03 23:00:39 -08:00
ucp_auth_link.php	[ticket/11700] Correct ucp_auth_link request interface references	2013-09-19 16:19:05 +02:00
ucp_confirm.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
ucp_groups.php	[ticket/12153] Remove redundant calls to pagination.on_page().	2014-02-03 23:00:39 -08:00
ucp_login_link.php	[ticket/11868] Replace phpbb_request_interface references	2013-09-26 12:02:17 +03:00
ucp_main.php	Merge pull request #2002 from prototech/ticket/12153	2014-02-18 14:11:48 -06:00
ucp_notifications.php	[ticket/12153] Remove redundant calls to pagination.on_page().	2014-02-03 23:00:39 -08:00
ucp_pm.php	[ticket/12005] Remove PM popup UCP module	2013-11-08 21:57:06 +01:00
ucp_pm_compose.php	[feature/plupload/integration] Integration of Plupload	2013-10-11 17:40:16 +02:00
ucp_pm_options.php	[ticket/12226] Split language strings to correctly allow multiple plural rules	2014-02-24 09:46:31 +01:00
ucp_pm_viewfolder.php	[ticket/12153] Remove redundant calls to pagination.on_page().	2014-02-03 23:00:39 -08:00
ucp_pm_viewmessage.php	[ticket/12235] Convert WLM to custom profile field	2014-03-04 10:19:08 +01:00
ucp_prefs.php	[ticket/11747] ucp_prefs_post core events	2013-07-26 18:33:27 -07:00
ucp_profile.php	[ticket/12235] Convert WLM to custom profile field	2014-03-04 10:19:08 +01:00
ucp_register.php	Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop	2014-02-02 16:34:55 +01:00
ucp_remind.php	[ticket/12159] Fix codesniffer complaints due to profilefields and passwords	2014-02-03 22:25:43 +01:00
ucp_resend.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
ucp_zebra.php	[ticket/11924] Fix some minor issues with the php event docs	2013-10-16 16:32:40 +02:00