Joas Schilling ab6e0bbef9 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	build/build.xml
	phpBB/composer.lock

2016-02-18 18:42:39 +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

[ticket/14129] Caches extensions autoloaders

2016-01-26 22:13:26 +01:00

captcha

[ticket/13454] Remove unused variables

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

config

…

console

[ticket/14434] Refactored to check migrations when setting them

2016-01-28 12:17:35 -08:00

controller

…

cron

[ticket/14402] Directly pass user id and ip

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

db

Merge branch '3.1.x' into 3.2.x

2016-02-18 18:42:39 +01:00

debug

[ticket/14177] CS

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

di

[ticket/14129] Caches extensions autoloaders

2016-01-26 22:13:26 +01:00

event

…

exception

…

extension

[ticket/14434] Refactored to check migrations when setting them

2016-01-28 12:17:35 -08:00

feed

…

files

[ticket/14448] Correctly pass verify setting if available

2016-02-08 13:26:19 +01:00

filesystem

…

group

…

groupposition

…

help

…

hook

…

install

[ticket/14462] Fix comments

2016-02-12 23:30:32 +01:00

language

[ticket/14432] Adds a method to get raw language values

2016-01-26 23:45:51 +01:00

lock

…

log

Merge branch '3.1.x'

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

message

…

mimetype

…

module

…

notification

…

passwords

…

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

…

search

[ticket/13454] Remove more unused variables

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

template

[ticket/14446] Add predefined placeholder variables to twig definition

2016-02-02 17:13:47 +01:00

textformatter

Merge pull request #4059 from JoshyPHP/ticket/14323

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

textreparser

…

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

[ticket/14440] Add comments

2016-02-11 22:18:09 +01:00

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

symfony_request.php

…

user_loader.php

…

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

…