Joas Schilling a3883a6f23 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-06-11 21:00:04 +02:00

..

auth

Merge branch '3.1.x'

2015-06-07 14:59:33 +02:00

avatar

[ticket/8672] Use fastImageSize in classes

2015-04-24 13:33:14 +02:00

cache

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

captcha

[ticket/13930] Add missing spaces to code

2015-06-07 22:53:41 +02:00

config

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

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

console

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

controller

Merge branch '3.1.x'

2015-05-17 20:02:29 +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-06-11 21:00:04 +02:00

di

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

event

Merge branch '3.1.x'

2015-05-28 14:16:11 +02:00

exception

[ticket/13361] Rename exception to runtime_exception

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

extension

[ticket/13793] Remove translation on throwing exceptions

2015-05-01 12:40:53 +02:00

feed

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

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

filesystem

[ticket/13814] Prevent phpbb_is_writable() method from truncating files

2015-05-04 16:53:27 +07:00

groupposition

…

help

[ticket/13844] Add events

2015-05-20 20:11:52 +02:00

hook

…

language

[ticket/13896] Fix coding style

2015-05-30 12:27:31 +02:00

lock

…

log

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

message

Merge pull request #3108 from Elsensee/ticket/13284

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

mimetype

[ticket/13031] Slightly change behavior of choose_mime_type and add unit tests

2014-09-05 21:55:49 +02:00

module

[ticket/13777] Remove module_class_not_defined_exception

2015-05-31 16:27:16 +02:00

notification

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

passwords

[ticket/13917] Do not pass non-string variables to hash_equals()

2015-06-04 17:16:22 +02:00

php

…

plupload

[ticket/13756] Fix resize after upload with plupload

2015-04-11 23:08:45 +02:00

profilefields

[ticket/13455] Update calls to request_var()

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

report

[ticket/13654] Moving reporting into controller

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

request

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

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

routing

[ticket/13388] Fix coding style

2015-05-30 13:14:27 +02:00

search

Merge pull request #3696 from marc1706/ticket/13930-master

2015-06-09 21:27:23 +02:00

template

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

textformatter

Merge pull request #3561 from s9e/ticket/10922

2015-05-29 16:15:04 +02:00

tree

[ticket/12557] Fix doc block errors found by Sami pt1

2014-08-03 07:03:08 +03:00

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

[ticket/12937] Do not return false. Return null for get and array() for all.

2014-08-08 15:29:34 +02:00

content_visibility.php

Merge pull request #3402 from brunoais/ticket/13621

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

datetime.php

[ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"

2014-09-25 18:09:32 +02:00

error_collector.php

[ticket/13306] move error_reporting call

2014-11-13 20:55:10 -06:00

file_downloader.php

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

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

filesystem.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

finder.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

json_response.php

…

pagination.php

[ticket/13059] Add core event to generate_page_link()

2014-10-01 20:55:07 +08:00

path_helper.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

permissions.php

[ticket/13822] Correctly display softdelete and post detail perms

2015-05-07 21:10:16 -07:00

recursive_dot_prefix_filter_iterator.php

…

session.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

symfony_request.php

[ticket/13280] Output escaping for the symfony request object

2014-11-16 16:45:19 +01:00

user_loader.php

[ticket/13498] Update calls to get_user_avatar()

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

user.php

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

version_helper.php

[ticket/13556] Fix exception translation with filedownloader

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

viewonline_helper.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00