Marc Alexander 80db259ab9 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/phpbb/notification/manager.php

2016-05-27 22:13:35 +02:00

..

attachment

[ticket/14589] Fix @var usage

2016-04-13 19:02:43 +02:00

auth

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:56:03 +02: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-05-12 19:16:03 +02:00

config

…

console

[ticket/14569] Extract CLI progress bar creation to a method

2016-04-12 10:56:23 -07:00

controller

Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x

2016-04-07 21:59:36 +02:00

cron

[ticket/14555] Uniformize cache directory usages

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

db

[ticket/14607] Add missing auto_increment to report_id

2016-05-01 17:29:10 +02:00

debug

…

di

Merge pull request #4236 from Nicofuma/ticket/13616

2016-04-13 10:11:24 +02: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/14591] Use the correct delimiter for MSSQL

2016-05-18 14:53:52 -04:00

language

[ticket/14645] Language pack not reconised when using a symlink

2016-05-21 19:50:12 +02:00

lock

…

log

Merge branch '3.1.x'

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

message

…

mimetype

…

module

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

notification

Merge branch '3.1.x' into 3.2.x

2016-05-27 22:13:35 +02: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

…

request

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:56:03 +02:00

routing

[ticket/13683] Removes extra / in script_path

2016-03-30 22:28:20 +02: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/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

2016-04-03 16:22:07 +02: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

…

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

…

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

…