Joas Schilling b566686b51 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php

2015-01-20 23:32:36 +01:00

..

auth

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

avatar

Merge pull request #3064 from marc1706/ticket/13197

2014-11-21 22:41:17 +01:00

cache

[ticket/12620] Use the container to get the environment name

2014-11-20 21:01:01 +01:00

captcha

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00

config

[ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()

2015-01-09 13:41:36 +01:00

console

[ticket/13211] Move console migrator output handler back to console folder

2014-10-25 12:03:13 -07:00

controller

[ticket/12620] Fix rebase

2014-11-20 23:15:49 +01:00

cron

[ticket/13232] Fix indentation

2014-10-27 15:45:24 -07:00

db

Merge branch 'develop-ascraeus' into develop

2015-01-20 23:32:36 +01:00

di

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

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

event

Merge branch 'develop-ascraeus' into develop

2015-01-20 23:32:36 +01:00

extension

Merge branch 'develop-ascraeus' into develop

2014-11-22 17:49:06 +01:00

feed

…

groupposition

…

hook

…

lock

…

log

[ticket/13148] Wrong version num; copy & paste fail

2014-12-29 08:23:31 +00:00

message

Merge pull request #3108 from Elsensee/ticket/13284

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

mimetype

…

notification

[ticket/13154] Wrong variable name in the comment block

2014-12-19 11:23:23 +00:00

passwords

[ticket/13203] Use string_compare method in passwords drivers

2014-10-22 14:54:55 -05:00

php

…

plupload

…

profilefields

Merge pull request #3138 from prototech/ticket/12642

2015-01-20 22:46:08 +01:00

request

[ticket/13396] Normalize multibyte characters in attachment file names.

2014-12-02 16:23:40 -08:00

routing

[ticket/12620] Fix functionnal tests

2014-11-21 08:26:19 +01:00

search

Merge branch 'develop-ascraeus' into develop

2015-01-19 23:23:57 +01:00

template

Merge pull request #3099 from Senky/ticket/13266

2014-12-27 13:31:01 +01:00

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

[ticket/13147] New line before comment block

2015-01-10 17:15:54 +00:00

datetime.php

…

error_collector.php

[ticket/13306] move error_reporting call

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

file_downloader.php

[ticket/13358] Use protected and public keywords where applicable

2014-11-21 23:30:47 +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

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01: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

…

version_helper.php

[ticket/13393] Call user->lang function directly

2014-11-27 00:55:01 +01:00

viewonline_helper.php

…