Marc Alexander 33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842 ...

Conflicts:
	phpBB/includes/acp/acp_groups.php

2013-11-27 14:55:24 +01:00

..

auth

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

avatar

Merge pull request #1815 from marc1706/ticket/11525

2013-11-13 09:52:21 -08:00

cache

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

config

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

console

[ticket/11998] Turn develop/extensions.php into console commands.

2013-11-05 21:40:42 +01:00

controller

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

cron

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

db

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842

2013-11-27 14:55:24 +01:00

di

[ticket/11949] Do not prepend leading backslash to cache class name

2013-11-09 17:06:38 +01:00

event

[ticket/12016] Use a service provider for event listeners

2013-11-13 17:34:06 +01:00

extension

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

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

feed

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

groupposition

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

hook

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

lock

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

log

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

notification

Merge pull request #1882 from prototech/ticket/11959

2013-11-21 13:27:52 -08:00

php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

plupload

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

request

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

search

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

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

template

[ticket/11943] Throw an exception if DEFINE is setup improperly

2013-11-09 11:14:55 -06:00

tree

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

class_loader.php

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

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

content_visibility.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

datetime.php

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

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

error_collector.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

filesystem.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

json_response.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

path_helper.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

permissions.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

session.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

symfony_request.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

user_loader.php

[task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.

2013-10-30 13:05:28 +01:00

user.php

[ticket/12005] Remove PM popup

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