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

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-04-10 10:06:07 +02:00

..

auth

Merge branch '3.1.x'

2015-02-22 18:57:36 +01:00

avatar

Merge pull request #3518 from marc1706/ticket/13703

2015-04-04 11:04:29 +02:00

cache

Merge branch '3.1.x'

2015-03-05 16:02:48 +01:00

captcha

Merge branch '3.1.x'

2015-04-06 11:09:20 +02:00

config

[ticket/13569] Add missing sql_freeresults and remove unneeded results

2015-02-02 17:36:39 +01:00

console

…

controller

Merge branch '3.1.x'

2015-04-06 16:54:54 +02:00

cron

[ticket/13455] Remove request_var() references from comments

2015-02-03 20:56:48 +01:00

db

Merge branch '3.1.x'

2015-04-10 10:06:07 +02:00

di

[ticket/13266] Enable the debug extension in the development environment

2014-11-22 12:33:45 +01:00

event

[ticket/13725] Coding guidelines: static public

2015-03-27 00:02:20 -07:00

exception

[ticket/13361] Rename exception to runtime_exception

2015-01-21 08:41:02 +01:00

extension

[ticket/13513] Use paths relative to the phpBB root in the router

2015-01-17 11:40:10 +01:00

feed

Merge branch 'ticket/13348-olympus' into ticket/13348

2015-02-03 18:30:45 +01:00

groupposition

…

help/controller

[ticket/13647] Use the Symfony way for redirecting

2015-02-27 22:58:51 +01:00

hook

…

lock

…

log

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

message

Merge pull request #3108 from Elsensee/ticket/13284

2014-11-21 23:10:00 +01:00

mimetype

…

notification

[ticket/13725] Coding guidelines: static public

2015-03-27 00:02:20 -07:00

passwords

…

php

…

plupload

[ticket/13550] Check that the Plupload temp directory is writable before moving

2015-03-15 16:06:35 -07:00

profilefields

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

request

[ticket/13455] Remove request_var() references from comments

2015-02-03 20:56:48 +01:00

routing

Merge pull request #3303 from Nicofuma/ticket/13513

2015-02-26 13:41:51 +01:00

search

Merge branch '3.1.x'

2015-03-14 23:44:58 +08:00

template

[ticket/13132] Twig: Add loops content to the root context

2015-03-05 21:38:59 +01:00

textformatter

[ticket/11768] Stylistic change. No functional change intended

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

tree

…

class_loader.php

…

composer.json

[ticket/13407] Bump minimal version to php 5.3.9

2015-02-04 17:40:18 +01:00

config_php_file.php

…

content_visibility.php

Merge pull request #3402 from brunoais/ticket/13621

2015-04-06 11:13:33 +02:00

datetime.php

…

error_collector.php

…

file_downloader.php

[ticket/13588] Fixes wrong message in info fsockopen() disabled

2015-02-07 13:50:08 +01:00

filesystem.php

…

finder.php

…

json_response.php

…

pagination.php

…

path_helper.php

Merge pull request #3055 from marc1706/ticket/13192

2015-01-19 16:45:43 +01:00

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

Merge branch '3.1.x'

2015-02-27 22:47:02 +01:00

symfony_request.php

…

user_loader.php

[ticket/13498] Update calls to get_user_avatar()

2015-01-11 21:09:21 +01:00

user.php

…

version_helper.php

[ticket/13556] Fix exception translation with filedownloader

2015-01-30 18:05:13 +01:00

viewonline_helper.php

…