Joseph Warner 3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth ...

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673

2013-09-06 20:35:54 -04:00

..

acp_board

[feature/auth-refactor] Add parent::setUp() in setUp()

2013-07-11 21:57:36 -04:00

auth

[feature/oauth] More small fixes

2013-09-02 16:52:41 -04:00

avatar

…

bbcode

…

cache

…

class_loader

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

compress

…

config

…

content_visibility

[ticket/9657] Define user before injecting

2013-07-13 11:25:38 -04:00

controller

[ticket/11215] Fix helper_url_test.php tests

2013-09-02 12:53:37 -07:00

cron

…

datetime

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

dbal

[ticket/11696] Rename db_tools.php so it can be autoloaded

2013-07-14 10:10:05 -04:00

di

Merge remote-tracking branch 'upstream/develop' into ticket/11574

2013-07-14 11:34:58 -04:00

download

…

event

…

extension

[ticket/11628] Remove remaining style_path_provider_test

2013-07-24 13:44:39 -05:00

filesystem

…

fixtures

…

functional

[ticket/11215] Use new URL structure for controllers

2013-08-31 14:51:28 -07:00

functions

…

functions_acp

…

functions_database_helper

…

functions_user

…

groupposition

…

lock

…

log

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

mock

[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth

2013-09-06 20:35:54 -04:00

network

…

notification

[ticket/11696] Rename db_tools.php so it can be autoloaded

2013-07-14 10:10:05 -04:00

privmsgs

…

profile

…

random

…

regex

…

request

…

search

…

security

…

session

[ticket/11620] Whitespace and combine function into test_case

2013-07-22 17:39:45 -07:00

template

[ticket/11812] Fix empty define

2013-09-02 16:35:42 -05:00

test_framework

Merge branch 'develop-olympus' into develop

2013-08-15 01:40:08 +02:00

text_processing

Merge branch 'develop-olympus' into develop

2013-08-03 15:37:01 +02:00

tmp

…

tree

…

upload

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

user

…

utf

…

wrapper

…

bootstrap.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

error_collector_test.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

lint_test.php

…

RUNNING_TESTS.md

…