Nils Adermann 6956a6eb00 Merge branch 'develop-olympus' into develop ...

By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php

2012-05-22 18:11:08 +02:00

..

bbcode

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

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

cache

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

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

class_loader

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

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

config

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

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

cron

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

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

dbal

Merge PR #810 branch 'develop-olympus' into develop

2012-05-21 23:02:58 -04:00

download

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

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

event

[feature/event-dispatcher] Fix copyright years

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

extension

Merge remote-tracking branch 'naderman/ticket/10663' into develop

2012-02-24 13:55:36 +01:00

functional

Merge branch 'develop-olympus' into develop

2012-05-22 18:11:08 +02:00

functions_acp

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

2012-01-02 19:10:36 +01: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

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

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

network

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

2012-01-02 19:10:36 +01: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/9916] Updating License in the header

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

request

[ticket/10733] Removing static from data providers

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

security

[ticket/10733] Removing static from data providers

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

session

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

template

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02:00

test_framework

Merge branch 'develop-olympus' into develop

2012-05-22 18:11:08 +02:00

text_processing

[ticket/10733] Removing static from data providers

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

tmp

[ticket/10309] Update .gitignore and move .gitkeep.

2011-08-20 14:34:02 -04:00

user

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

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

utf

[ticket/10733] Removing static from data providers

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

wrapper

[ticket/9916] Updating License in the header

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

bootstrap.php

[ticket/10492] Backporting functional tests

2012-04-21 04:37:57 -05:00

error_collector_test.php

[ticket/9916] Updating License in the header

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

mock_user.php

[ticket/9916] Updating License in the header

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

RUNNING_TESTS.txt

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

2012-05-13 20:08:49 +02:00