Joas Schilling 917a5ce0df Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/ucp/ucp_profile.php

2015-02-02 23:23:26 +01:00

..

acp

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:23:26 +01:00

diff

[ticket/12557] Fix pass by reference doc blocks

2014-08-07 11:39:04 +03:00

hooks

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

questionnaire

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

ucp

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:23:26 +01:00

utf

[feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback

2014-11-08 11:41:58 +01:00

.htaccess

…

bbcode.php

Merge branch 'develop-ascraeus' into develop

2015-01-09 17:49:30 +01:00

compatibility_globals.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

constants.php

Merge branch 'prep-release-3.1.3' into develop-ascraeus

2015-01-31 12:11:43 +01:00

functions_acp.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

functions_admin.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

functions_compatibility.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

functions_compress.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

functions_content.php

[ticket/13297] Add unicode modifier to url/email regular expression patterns.

2014-11-09 20:59:14 +07:00

functions_convert.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

functions_database_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_display.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

functions_download.php

Merge branch 'develop-olympus' into develop-ascraeus

2015-01-28 19:56:47 +01:00

functions_install.php

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00

functions_jabber.php

[ticket/12487] Update PHP code

2015-01-11 13:22:59 +01:00

functions_mcp.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

functions_messenger.php

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

functions_module.php

[ticket/12919] Use the modules basename as identifier for extension modules

2014-08-07 14:06:45 +02:00

functions_posting.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

functions_privmsgs.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

functions_transfer.php

[ticket/12999] Remove @author tags

2014-08-19 22:54:45 +02:00

functions_upload.php

[ticket/13031] Guess with all mimetype guessers and pick best guess

2014-09-05 10:56:06 +02:00

functions_user.php

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:19:49 +01:00

functions.php

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:12:47 +01:00

index.htm

…

message_parser.php

Merge pull request #3189 from rxu/ticket/12926

2015-01-10 00:09:57 +01:00

sphinxapi.php

[ticket/12721] Update rules descriptions

2014-06-16 23:07:28 +02:00

startup.php

[ticket/13531] Send 404 Not Found.

2015-01-21 01:02:16 +01:00