Nils Adermann 1d388d98ab Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD ...

* github-phpbb/develop-olympus:
  [ticket/11159] static public is the currently approved order.

Conflicts:
	tests/dbal/select_test.php
	tests/dbal/write_test.php
	tests/request/request_var_test.php
	tests/security/extract_current_page_test.php
	tests/security/redirect_test.php
	tests/template/template_test.php
	tests/text_processing/make_clickable_test.php
	tests/utf/utf8_clean_string_test.php

2012-11-06 20:02:40 +01: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

[ticket/10973] Drop all require_once for mocks. Use autoloading.

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

compress

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

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

config

[ticket/10973] Drop all require_once for mocks. Use autoloading.

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

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

Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD

2012-11-06 20:02:40 +01:00

download

[ticket/10973] Drop all require_once for mocks. Use autoloading.

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

event

[feature/event-dispatcher] Fix copyright years

2012-03-30 14:22:20 +02:00

extension

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04: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

[ticket/10733] Removing static from data providers

2012-04-01 19:14:53 +03:00

lock

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

mock

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

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

network

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

privmsgs

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

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

profile

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00

random

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00

regex

[ticket/10162] Add test cases for top level domain names longer than 6 chars.

2012-05-30 21:11:17 +02:00

request

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

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

security

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

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

session

[feature/add_events] Re-fix broken test

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

template

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

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

test_framework

Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD

2012-11-06 20:02:40 +01:00

text_processing

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

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

tmp

…

upload

[ticket/10941] Removed superfluous array

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

user

[feature/class-prefix] Rename user and session to phpbb_*

2012-03-31 18:14:07 +02:00

utf

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

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

wrapper

[ticket/10931] Also test get_bytes() and get_string() with false.

2012-06-11 15:46:03 +02:00

bootstrap.php

[feature/add_events] Re-fix broken test

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

error_collector_test.php

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00

RUNNING_TESTS.txt

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

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