Nils Adermann f958d05aed Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2015-05-30 10:58:40 +02:00

..

auth

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

avatar

…

cache

[ticket/13782] Rename null driver to dummy for PHP7 compatibility

2015-05-04 10:10:12 +02:00

captcha

…

config

…

console

…

controller

Merge branch '3.1.x'

2015-05-17 20:02:29 +02:00

cron

…

db

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

di

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

event

Merge branch '3.1.x'

2015-05-28 14:16:11 +02:00

exception

…

extension

…

feed

…

filesystem

[ticket/13814] Prevent phpbb_is_writable() method from truncating files

2015-05-04 16:53:27 +07:00

groupposition

…

help

[ticket/13844] Add events

2015-05-20 20:11:52 +02:00

hook

…

language

[ticket/13844] Remove hacky code for the help array

2015-05-17 21:18:17 +02:00

lock

…

log

Merge branch '3.1.x'

2015-05-28 12:52:36 +02:00

message

…

mimetype

…

notification

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

passwords

…

php

…

plupload

…

profilefields

…

report

…

request

…

routing

Merge pull request #3608 from Nicofuma/ticket/13829

2015-05-20 10:53:16 +02:00

search

…

template

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

textformatter

Merge pull request #3561 from s9e/ticket/10922

2015-05-29 16:15:04 +02:00

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

file_downloader.php

…

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

…

permissions.php

[ticket/13822] Correctly display softdelete and post detail perms

2015-05-07 21:10:16 -07:00

recursive_dot_prefix_filter_iterator.php

…

session.php

…

symfony_request.php

…

user_loader.php

…

user.php

…

version_helper.php

…

viewonline_helper.php

…