Joas Schilling b2a26ab5f4 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-12-12 15:24:29 +01:00

..

attachment

[ticket/14168] Correctly state return type of upload and upload_attachment

2015-10-12 12:11:26 +02:00

auth

Merge branch '3.1.x'

2015-10-24 18:23:52 +02:00

avatar

Merge branch '3.1.x'

2015-10-19 14:40:07 +02:00

cache

[ticket/14157] Allow to set the alt/title attribute on post icons

2015-10-10 15:29:31 +02:00

captcha

[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.

2015-10-14 19:05:27 -07: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'

2015-12-12 15:24:29 +01:00

di

[ticket/14039] Revamp updater

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

event

[ticket/14039] Revamp updater

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

exception

…

extension

…

feed

…

files

[ticket/14273] Remove unused core.root_path dependency in files.upload service

2015-11-05 13:52:04 -08:00

filesystem

…

group

…

groupposition

…

help

…

hook

[ticket/14039] Revamp updater

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

install

[ticket/14344] Improve output of HTML errors trigged during install

2015-12-07 23:36:49 +01:00

language

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

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

lock

…

log

…

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

Merge branch '3.1.x'

2015-10-14 08:38:32 +02:00

profilefields

…

report

…

request

…

routing

[ticket/14039] Revamp updater

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

search

[ticket/14044] Automatically trigger rollback on insert in transaction

2015-10-23 20:47:56 +02:00

template

[ticket/12633] Doesn't use DEBUG to debug templates events

2015-09-18 21:23:34 +02:00

textformatter

…

textreparser

Merge pull request #4005 from Elsensee/ticket/14257

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

tree

…

class_loader.php

…

composer.json

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

file_downloader.php

…

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

…

permissions.php

Merge branch '3.1.x'

2015-10-11 10:48:53 +02:00

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge branch '3.1.x'

2015-12-07 21:52:38 +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

…

version_helper.php

…

viewonline_helper.php

…