Marc Alexander 6337407192 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/db/migration/data/v310/style_update_p1.php

2015-05-22 11:51:25 +02:00

..

auth

Merge branch '3.1.x'

2015-05-16 13:40:07 +02:00

avatar

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

cache

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

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

captcha

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

config

…

console

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

controller

Merge branch '3.1.x'

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

cron

…

db

Merge branch '3.1.x'

2015-05-22 11:51:25 +02:00

di

[ticket/13849] Fix development environment

2015-05-19 21:59:41 +02:00

event

Merge branch '3.1.x'

2015-05-06 01:14:08 +02:00

exception

…

extension

[ticket/13793] Remove translation on throwing exceptions

2015-05-01 12:40:53 +02:00

feed

…

filesystem

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

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

groupposition

…

help/controller

…

hook

…

language

[ticket/13762] Optional DI injectable default language module array

2015-05-02 13:37:13 +02:00

lock

…

log

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

2015-05-04 10:11:28 +02:00

message

…

mimetype

…

notification

[ticket/13680] Renamed get_quote_authors to get_outermost_quote_authors

2015-05-15 02:12:52 +02:00

passwords

[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()

2015-04-21 10:00:30 +01:00

php

…

plupload

[ticket/13756] Fix resize after upload with plupload

2015-04-11 23:08:45 +02:00

profilefields

…

report

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

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-16 13:40:07 +02:00

textformatter

Merge pull request #3586 from s9e/ticket/13680

2015-05-20 00:38:49 +02:00

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

Merge pull request #3402 from brunoais/ticket/13621

2015-04-06 11:13:33 +02:00

datetime.php

…

error_collector.php

…

file_downloader.php

…

filesystem.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

finder.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

json_response.php

…

pagination.php

…

path_helper.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

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

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

symfony_request.php

…

user_loader.php

…

user.php

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

version_helper.php

…

viewonline_helper.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00