Marc Alexander 97e002cc3d Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/log/log.php

2016-01-15 11:18:13 +01:00

..

attachment

…

auth

[ticket/14250] Change token_storage class to fit changed interface

2016-01-04 03:38:28 +01:00

avatar

Merge branch '3.1.x'

2016-01-06 13:26:23 +01:00

cache

…

captcha

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

config

…

console

[ticket/14257] Fix CLI reparser and set cron interval

2015-11-08 03:29:37 +01:00

controller

…

cron

[ticket/14257] Fix CLI reparser and set cron interval

2015-11-08 03:29:37 +01:00

db

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

debug

[ticket/14177] CS

2015-12-15 19:55:55 +01:00

di

[ticket/14377] Allow extensions to register compiler pass

2015-12-22 18:48:49 +01:00

event

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

exception

…

extension

…

feed

…

files

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

filesystem

…

group

…

groupposition

…

help

…

hook

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

install

[ticket/13442] UTF-8 symbols for database host

2016-01-14 15:38:14 +03:00

language

[ticket/14044] Patch language::set_fallback_array()

2015-10-30 15:25:27 +01:00

lock

…

log

Merge branch '3.1.x'

2016-01-15 11:18:13 +01:00

message

…

mimetype

…

module

…

notification

Merge pull request #3971 from VSEphpbb/ticket/14237

2015-10-29 14:46:02 +01:00

passwords

Merge branch '3.1.x'

2015-10-21 00:32:20 +02:00

php

…

plupload

…

profilefields

…

report

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

request

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

routing

[ticket/14039] Revamp updater

2015-10-17 23:05:57 +02:00

search

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +01:00

template

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

textformatter

Merge pull request #4059 from JoshyPHP/ticket/14323

2016-01-13 12:55:31 +01:00

textreparser

Merge pull request #4005 from Elsensee/ticket/14257

2015-12-05 11:21:40 +01:00

tree

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

class_loader.php

…

composer.json

[ticket/14382] Specify the branch-alias in the composer.json files

2016-01-09 15:42:42 +01:00

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

file_downloader.php

[ticket/12618] Change ssl:// to tls://

2016-01-10 19:33:45 +01:00

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

…

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge branch '3.1.x'

2016-01-13 09:27:35 +01:00

symfony_request.php

…

user_loader.php

[ticket/14334] Use phpbb_get_avatar() in user_loader

2015-12-03 16:43:00 +01:00

user.php

[ticket/13454] Fix a few issues introduced by overdeleting stuff

2016-01-06 13:52:11 +01:00

version_helper.php

…

viewonline_helper.php

…