Nils Adermann 89a6fed91d Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/11148] Remove unneeded variable mimetype and use type octet-stream
  [ticket/11148] Change expected output with disallowed content in test
  [ticket/11148] Always use the output of the mimetype guesser in get_mimetype
  [ticket/11148] Get rid of extra line in mimetype guesser setter doc block
  [ticket/11148] Add missing parts to docblock of get_mimetype() method
  [ticket/11148] Default to application/octet-stream if no mimetype given
  [ticket/11148] Use mimetype guesser for uploaded avatars
  [ticket/11148] Pass mimetype guesser to upload_attachment() function
  [ticket/11148] Add mimetype guesser to filespec and fileupload class

2014-08-07 12:06:49 +02:00

..

acp

Merge branch 'develop-ascraeus' into develop

2014-08-06 23:42:35 +02:00

captcha

[ticket/10073] Deduplicate the if statement

2014-05-29 02:14:40 +02:00

diff

[ticket/12594] Replace phpBB Group with phpBB Limited

2014-05-28 01:07:56 +02:00

hooks

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

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

mcp

Merge branch 'develop-ascraeus' into develop

2014-07-11 11:53:38 +02:00

questionnaire

[ticket/12775] Remove useless includes of config.php

2014-07-07 01:02:42 +02:00

ucp

Merge branch 'develop-ascraeus' into develop

2014-08-02 13:56:30 +02:00

utf

[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset

2014-06-16 19:05:09 +02:00

.htaccess

…

bbcode.php

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

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

compatibility_globals.php

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

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

constants.php

[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development

2014-07-11 17:22:16 +02:00

functions_acp.php

[ticket/12902] Remove duplicate entry in switch statement

2014-08-02 13:44:51 +02:00

functions_admin.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02:00

functions_compatibility.php

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

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

functions_compress.php

[ticket/12594] Replace phpBB Group with phpBB Limited

2014-05-28 01:07:56 +02:00

functions_content.php

[ticket/12013] Use the correct variable for the forum id.

2014-07-04 00:56:04 -07:00

functions_convert.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02: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/12880] Changed name change @since as requested

2014-08-01 11:09:26 +01:00

functions_download.php

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

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

functions_install.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-07-30 15:01:16 +02:00

functions_jabber.php

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

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

functions_mcp.php

[ticket/12612] Prefix check_ids() with phpbb_

2014-06-23 23:01:52 +02:00

functions_messenger.php

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

2014-05-28 01:02:39 +02:00

functions_module.php

[ticket/12875] Find language files in the default and english language ...

2014-08-06 23:04:33 +02:00

functions_posting.php

Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus

2014-08-07 12:06:33 +02:00

functions_privmsgs.php

Merge branch 'ticket/11480' into ticket/11480-ascraeus

2014-07-30 21:01:05 +02:00

functions_transfer.php

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

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

functions_upload.php

Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus

2014-08-07 12:06:33 +02:00

functions_url_matcher.php

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

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

functions_user.php

Merge pull request #2697 from n-aleha/ticket/12816

2014-07-07 00:20:27 +02:00

functions.php

Merge pull request #2717 from Nicofuma/ticket/12836

2014-08-07 11:47:37 +02:00

index.htm

…

message_parser.php

Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus

2014-08-07 12:06:33 +02:00

sphinxapi.php

[ticket/12721] Update rules descriptions

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

startup.php

[ticket/11266] Better message for when composer dependencies are missing.

2014-05-29 16:13:29 +02:00