Andreas Fischer 4f3f4a40d6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php

2012-10-18 16:34:59 +02:00

..

bbcode

Merge branch 'develop-olympus' into develop

2012-07-08 23:10:42 +02:00

cache

[ticket/10875] Fix cache test

2012-08-06 18:43:46 -05:00

class_loader

…

compress

[ticket/11109] Re-add file conflict checks to compress class

2012-09-14 01:26:33 +02:00

config

…

cron

Merge branch 'develop' into feature/dic

2012-07-21 15:36:25 +02:00

datetime

[feature/new-tz-handling] Fix unit test

2012-07-18 17:16:34 +02:00

dbal

[ticket/10942] Avoid possible conflicts with magic words in unit tests

2012-07-16 16:59:40 +02:00

download

…

event

…

extension

[ticket/10631] Some cleanup of the test cases

2012-09-01 15:06:02 +01:00

functional

Merge branch 'develop-olympus' into develop

2012-09-01 17:06:59 +02:00

functions

[ticket/10848] Add phpbb_ prefix.

2012-10-17 15:13:35 -04:00

functions_acp

[feature/php-events] Add mock for unit tests and create it were needed

2012-08-11 15:25:14 +02:00

group_positions

…

lock

…

mock

Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop

2012-08-20 09:09:53 -04:00

network

…

privmsgs

[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)

2012-07-22 01:45:30 +02:00

profile

…

random

…

regex

…

request

[ticket/8713] Add simple (non-nested) test case for untrimmed set_var().

2012-09-08 13:44:50 +02:00

security

…

session

[feature/add_events] Re-fix broken test

2012-08-21 11:18:53 -04:00

template

…

test_framework

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631

2012-09-01 21:15:39 +01:00

text_processing

Merge remote-tracking branch 'github-bantu/ticket/10973' into develop

2012-07-08 23:12:22 +02:00

tmp

…

upload

[ticket/10941] Removed superfluous array

2012-07-09 14:08:21 +01:00

user

…

utf

…

wrapper

…

bootstrap.php

[feature/add_events] Re-fix broken test

2012-08-21 11:18:53 -04:00

error_collector_test.php

…

RUNNING_TESTS.txt

Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus

2012-07-17 21:12:47 +02:00