Joas Schilling 1a0cba1099 Merge branch 'develop-ascraeus' into develop ...

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

2014-11-25 16:47:22 +01:00

..

auth

Merge pull request #3068 from marc1706/ticket/13204

2014-11-21 22:52:24 +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/13316] Ensure Recaptcha image uses https when necessary.

2014-11-21 12:17:04 -08:00

config

…

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

2014-11-25 16:47:22 +01:00

di

[ticket/12620] Fix rebase

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

event

[ticket/13063] Introduces a new \phpbb\routing\router class

2014-11-20 16:03:48 +01:00

extension

Merge branch 'develop-ascraeus' into develop

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

feed

…

groupposition

…

hook

…

lock

…

log

…

message

Merge pull request #3108 from Elsensee/ticket/13284

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

mimetype

…

notification

[ticket/13337] Allow empty array passed to sql_in_set()

2014-11-14 11:08:35 +01:00

passwords

…

php

…

plupload

…

profilefields

[ticket/13209] Gather language field values for boolean CPF's in all steps.

2014-11-11 16:32:04 -08:00

request

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

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

routing

[ticket/12620] Fix functionnal tests

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

search

[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback

2014-11-08 11:36:13 +01:00

template

Merge branch 'develop-ascraeus' into develop

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

tree

…

class_loader.php

…

composer.json

…

config_php_file.php

…

content_visibility.php

…

datetime.php

…

error_collector.php

…

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 #8 from phpbb/ticket/security-169

2014-11-22 15:51:48 +01:00

permissions.php

…

recursive_dot_prefix_filter_iterator.php

…

session.php

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

2014-11-16 16:45:19 +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

…

user.php

…

version_helper.php

Merge branch 'ticket/13358' into ticket/security-171

2014-11-22 15:24:27 +01:00

viewonline_helper.php

…