Marc Alexander 1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x ...

Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html

2016-03-27 09:59:25 +02: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' into 3.2.x

2016-03-24 11:49:31 +01:00

cache

[ticket/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +01:00

captcha

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:43:05 +01:00

config

…

console

[ticket/12684] Use a switch statement for readability

2016-03-21 13:54:50 -07:00

controller

Merge branch '3.1.x' into 3.2.x

2016-03-08 22:18:42 +01:00

cron

[ticket/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +01:00

db

Merge pull request #4243 from marc1706/ticket/14136-3.2.x

2016-03-24 18:00:42 +01:00

debug

[ticket/14177] CS

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

di

[ticket/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +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/14510] Prevent infinite loop in add_bots task

2016-03-02 21:48:10 +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

Merge branch '3.1.x' into 3.2.x

2016-03-13 20:24:41 +01:00

passwords

…

php

…

plupload

…

profilefields

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

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/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +01:00

search

Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x

2016-03-27 09:59:25 +02:00

template

[ticket/14457] Handle the case where there isn't any 'definition' bag

2016-02-18 17:30:31 +01:00

textformatter

Merge pull request #4059 from JoshyPHP/ticket/14323

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

textreparser

[ticket/14381] Set the mode in message parser to "reparse"

2016-03-24 19:49:23 +01:00

tree

[ticket/13454] Remove unused variables

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

class_loader.php

…

composer.json

[ticket/14495] Updates the version to 3.3.0-a1-dev

2016-02-24 22:25:41 +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

[ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance

2016-03-17 00:50:08 +07:00

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

[ticket/14334] Use phpbb_get_avatar() in user_loader

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

user.php

Merge branch '3.1.x' into 3.2.x

2016-03-24 17:53:57 +01:00

version_helper.php

…

viewonline_helper.php

…