Nathan Guse 3181c44fc9 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10549] Adds language variables

Conflicts:
	phpBB/includes/functions_module.php

2014-03-10 21:44:04 -05:00

..

acp

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

captcha

[ticket/10763] Fix static calls to non static methods in colour_manager

2014-03-09 21:42:59 +01:00

db

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

diff

…

hooks

…

mcp

Merge pull request #2045 from rxu/ticket/12213

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

questionnaire

…

ucp

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

utf

…

.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

[ticket/12250] Remove deprecated phpbb_clean_path function

2014-03-07 03:44:28 +05:30

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

[ticket/12240] Added class code for custom bbcodes based on bbcode_tag

2014-03-02 20:30:09 +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/10763] Do not call messenger::error() statically

2014-03-09 22:03:38 +01:00

functions_module.php

Merge branch 'develop-olympus' into develop

2014-03-10 21:44:04 -05: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/10763] Do not call non-static transfer() statically

2014-03-09 21:53:21 +01:00

functions_upload.php

[feature/plupload/integration] Integration of Plupload

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

functions_url_matcher.php

[ticket/12090] Split finding routes and returning routes into 2 methods

2014-03-09 18:38:21 +01:00

functions_user.php

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

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

functions.php

[ticket/12250] Remove deprecated phpbb_clean_path function

2014-03-06 23:51:49 +05:30

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

…

startup.php

…