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

[ticket/12235] Convert WLM to custom profile field

2014-03-04 10:19:08 +01:00

captcha

[task/code-sniffer] Replace spaces with tabs.

2013-10-30 13:37:29 +01:00

db

[ticket/12235] Convert WLM to custom profile field

2014-03-04 10:19:08 +01:00

diff

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

Merge pull request #2045 from rxu/ticket/12213

2014-02-19 10:42:17 -06:00

questionnaire

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

ucp

Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop

2014-03-05 11:49:11 +01:00

utf

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

.htaccess

…

bbcode.php

Merge branch 'develop-olympus' into develop

2013-12-02 10:07:49 +01:00

constants.php

[ticket/12180] Add "Each file MUST end with exactly one newline character" rule

2014-02-10 15:01:50 +01:00

functions_acp.php

[ticket/10910] Do not add size when its 1 (default)

2013-11-22 15:52:59 +01:00

functions_admin.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

functions_compatibility.php

[feature/avatars] Use deprecated for compatibility function

2013-02-03 23:06:30 +01:00

functions_compress.php

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00

functions_container.php

[ticket/11866] More namespaces

2013-09-26 00:58:37 +02:00

functions_content.php

Merge remote-tracking branch 'brunoais/ticket/11663' into develop

2013-11-02 16:26:29 +01:00

functions_convert.php

[ticket/12005] Remove PM popup from converter

2013-11-08 21:57:05 +01:00

functions_database_helper.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

functions_display.php

Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop

2013-12-20 16:11:02 +01:00

functions_download.php

[ticket/12171] Send correct status 403 when forbidden and 404 when not found

2014-02-10 12:56:45 +01:00

functions_install.php

[ticket/12023] Correctly compare the size of the array in ignore_new_files

2013-11-19 00:23:49 +01:00

functions_jabber.php

Merge branch 'develop-olympus' into develop

2013-07-12 10:37:52 -05:00

functions_messenger.php

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00

functions_module.php

[ticket/12006] global $phpbb_dispatcher;

2014-01-17 20:26:59 -06:00

functions_posting.php

Merge pull request #2030 from rxu/ticket/12190

2014-02-19 10:50:21 -06:00

functions_privmsgs.php

[ticket/12226] Split language strings to correctly allow multiple plural rules

2014-02-24 09:46:31 +01:00

functions_transfer.php

[ticket/12077] Fix another strict standards error.

2013-12-19 19:36:49 -08:00

functions_upload.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

functions_url_matcher.php

[ticket/11948] Allow resource importing for routing

2013-10-21 21:52:48 +02:00

functions_user.php

[ticket/12115] Also port user interests to profile fields

2014-02-06 11:32:11 +01:00

functions.php

Merge pull request #1716 from marc1706/feature/passwords

2014-02-02 06:26:35 -08:00

index.htm

…

message_parser.php

[ticket/11915] Provide the URL to the attachment when it's uploaded.

2014-01-17 19:20:36 -08:00

sphinxapi.php

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00