Nathaniel Guse a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/install/database_update.php

2013-02-26 15:32:27 -06:00

..

bbcode

[ticket/11250] Use user defined message as incomplete message

2012-12-14 18:31:12 +01:00

cache

[ticket/11037] Fix unit tests.

2012-12-29 14:23:14 -05:00

class_loader

…

compress

Merge branch 'develop-olympus' into develop

2012-12-20 21:56:10 +01:00

config

…

controller

[feature/controller] Reword comment for clarification

2012-11-16 17:05:57 -05:00

cron

[feature/compiled-dic] Remove old test

2012-11-10 12:02:55 +01:00

datetime

…

dbal

[feature/migrations] Function effectively_installed() in migrations

2013-01-13 12:39:08 -06:00

di

[ticket/11015] Fixup some things from the big merge

2012-11-12 11:16:39 +01:00

download

…

event

[feature/compiled-dic] Compile the DI Container into a cached class

2012-11-10 11:40:09 +01:00

extension

[feature/migrations] Fix failing tests (again)

2013-02-13 21:41:52 -06:00

fixtures

[ticket/10205] Add some columns to the empty fixture file for mssqlnative.

2012-12-04 19:00:42 -05:00

functional

Merge remote-tracking branch 'p/ticket/10758' into develop

2012-12-25 15:18:47 +01:00

functions

[ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.

2012-12-13 19:15:24 -05:00

functions_acp

…

functions_database_helper

[ticket/11162] Reformat.

2012-12-13 03:07:25 -05:00

functions_user

[ticket/9492] Fix missing phpbb_container in unit tests

2013-01-20 20:59:27 +01:00

group_positions

…

lock

[ticket/10103] Assert with messages.

2012-12-04 13:50:35 -05:00

mock

[ticket/11103] Fix some various issues, better comments

2013-01-15 12:10:07 -06:00

network

…

notification

[ticket/11103] Fix some various issues, better comments

2013-01-15 12:10:07 -06:00

privmsgs

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

profile

…

random

…

regex

…

request

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

search

[ticket/11255] Change search tests to use mock cache.

2012-12-07 15:32:26 -05:00

security

[ticket/11159] static public is the currently approved order.

2012-11-06 10:41:06 -05:00

session

Merge remote-tracking branch 'p/ticket/11248' into develop

2012-12-22 23:25:54 +01:00

template

Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus

2013-01-22 20:32:07 +01:00

test_framework

[feature/migrations] Fix failing tests (again)

2013-02-13 21:41:52 -06:00

text_processing

[ticket/11159] static public is the currently approved order.

2012-11-06 10:41:06 -05:00

tmp

…

upload

[ticket/10763] Make functions for remote avatars static

2012-12-17 17:42:13 +01:00

user

[ticket/11103] Some improvements to the user loader

2012-12-08 18:40:41 -06:00

utf

[ticket/11159] static public is the currently approved order.

2012-11-06 10:41:06 -05:00

wrapper

…

bootstrap.php

…

error_collector_test.php

…

lint_test.php

[ticket/10716] Collect standard error from executed php process.

2012-12-04 18:52:27 -05:00

RUNNING_TESTS.txt

[ticket/11294] Update required/optional extension list for develop.

2012-12-27 01:10:58 -05:00