Joas Schilling 77ed437b79 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html

2014-09-24 14:49:50 +02:00

..

acp

Merge branch 'develop-ascraeus' into develop

2014-09-24 14:49:50 +02: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

Merge branch 'develop-ascraeus' into develop

2014-09-12 00:52:24 +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-09-24 14:49:50 +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/12957] Update the constructions of the template engine

2014-08-10 03:32:27 +02:00

compatibility_globals.php

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

constants.php

[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development

2014-09-20 09:52:53 +02:00

functions_acp.php

[ticket/13045] Remove Pragma headers

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

functions_admin.php

Merge pull request #2894 from Nicofuma/ticket/12999

2014-08-21 13:44:10 +02:00

functions_compatibility.php

[ticket/12858] Directly return and use timezone selects

2014-09-17 19:07:24 +02:00

functions_compress.php

[ticket/13045] Remove Pragma headers

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

functions_content.php

[ticket/12999] Remove @author tags

2014-08-19 22:54:45 +02: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/13005] Add event to display_forums() to modify category template data

2014-08-22 18:53:20 +08:00

functions_download.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +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/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

functions_messenger.php

Merge branch 'develop-ascraeus' into develop

2014-08-10 18:07:11 +02: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/13019] Always accept a reason for deleting a post/topic.

2014-09-14 10:38:56 -07:00

functions_privmsgs.php

[ticket/13027] round to floor

2014-09-09 21:33:19 +02: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_url_matcher.php

[ticket/12557] Fix php file description

2014-08-07 13:19:49 +03:00

functions_user.php

Merge pull request #2984 from nickvergessen/ticket/10729-asc

2014-09-23 11:09:29 +02:00

functions.php

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +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