Marc Alexander 47b32f1da9 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php

2015-08-08 22:23:03 +02:00

..

acp_board

…

auth

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

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

avatar

Merge branch '3.1.x'

2015-08-08 22:23:03 +02:00

bbcode

…

cache

[ticket/13782] Rename null driver test to dummy driver test

2015-05-04 10:13:04 +02:00

captcha

[ticket/13522] Fix globals for 3.2 in Q&A tests

2015-04-06 12:08:55 +02:00

class_loader

…

compress

…

config

…

console

[ticket/12692] Fix tests and update style

2015-08-06 13:26:14 +02:00

content_visibility

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

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

controller

[ticket/13388] Integrate routing and di parameters resolution

2015-05-29 16:48:51 +02:00

cron

…

datetime

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

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

dbal

Merge branch '3.1.x'

2015-06-09 20:23:29 +02:00

di

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

download

…

event

[ticket/13872] Remove subsilver2 from md exporter test

2015-05-28 15:52:18 +02:00

extension

[ticket/13777] Reorder get_module_infos() method's arguments

2015-05-31 16:03:11 +02:00

filesystem

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

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

fixtures

…

functional

[ticket/13935] Removed UI

2015-07-15 22:05:06 +02:00

functions

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

functions_acp

[ticket/sec-184] Fix tests

2015-06-07 16:43:27 +02:00

functions_content

…

functions_database_helper

…

functions_install

…

functions_privmsgs

[ticket/9109] Only query database once in phpbb_get_max_setting_from_group

2015-02-08 21:16:05 +01:00

functions_user

Merge branch '3.1.x'

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

groupposition

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

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

help

[ticket/13844] Add events

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

installer

[ticket/14053] Fix tests for installer config

2015-07-27 16:04:34 +02:00

language

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

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

lock

…

log

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

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

migrator

[ticket/10748] Replace direct creations of tools();

2015-02-07 14:41:39 +01:00

mimetype

…

mock

[ticket/11444] Update tests and cleanup types/methods

2015-07-13 22:41:14 +02:00

network

…

notification

[ticket/11444] Update tests and cleanup types/methods

2015-07-13 22:41:14 +02:00

pagination

[ticket/13388] Integrate routing and di parameters resolution

2015-05-29 16:48:51 +02:00

passwords

…

path_helper

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

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

plupload

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

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

privmsgs

…

profilefields

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

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

random

…

regex

[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()

2015-05-11 20:43:47 +02:00

request

[ticket/13455] Update calls to request_var()

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

search

[ticket/13685] Fix tests for fulltext search

2015-06-07 18:40:49 +01:00

security

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

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

session

[ticket/13961] Move back service_collections under original namespace

2015-06-26 01:04:36 +02:00

template

[ticket/13995] Fix errors in tests from merge conflict

2015-07-08 15:11:10 -07:00

test_framework

Merge pull request #3698 from s9e/ticket/13935

2015-08-05 12:59:55 +02:00

text_formatter/s9e

[ticket/13935] Allow more admin-configurable schemes in post links

2015-07-15 22:05:06 +02:00

text_processing

Merge pull request #3747 from rxu/ticket/13377

2015-07-13 17:36:35 +02:00

text_reparser/plugins

[ticket/13987] Replaced optional parameter with explicit API

2015-07-06 23:45:38 +02:00

tmp

…

tree

…

ui

…

upload

Merge pull request #3524 from marc1706/ticket/8672

2015-04-27 16:26:40 +02:00

user

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

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

utf

…

version

[ticket/13782] Rename null driver to dummy for PHP7 compatibility

2015-05-04 10:10:12 +02:00

viewonline

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

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

wrapper

…

bootstrap.php

…

composer.json

…

composer.lock

…

config_php_file_test.php

…

error_collector_test.php

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

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

lint_test.php

Merge branch '3.0.x' into 3.1.x

2015-05-29 22:46:28 +02:00

RUNNING_TESTS.md

…