Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ...

Conflicts:
	phpBB/includes/functions.php

2013-10-03 10:04:59 +02:00

..

auth

[feature/passwords] Inject passwords manager into auth providers

2013-10-02 13:28:38 +02:00

avatar

[ticket/11700] Correctly load avatar templates for namespaced drivers

2013-09-19 16:21:38 +02:00

cache

[ticket/11700] Fix installation after develop merge

2013-09-16 03:14:39 +02:00

config

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

controller

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

cron

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

db

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

2013-10-03 10:04:59 +02:00

di

[ticket/11700] Correctly convert old acm type to namespaced class name

2013-09-16 17:33:56 +02:00

event

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

extension

[ticket/11700] Use spaces, not tabs

2013-09-25 14:36:50 +02:00

feed

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

groupposition

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

hook

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

lock

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

log

[ticket/11700] Fix tests after merging new develop code

2013-09-16 02:41:03 +02:00

notification

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

passwords

[feature/passwords] Rename manager methods to check() and hash()

2013-10-02 13:30:36 +02:00

php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

request

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

search

[ticket/11700] Fix some more incorrectly changed comments

2013-09-19 15:27:03 +02:00

template

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26 15:34:44 +02:00

tree

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

class_loader.php

[ticket/11700] Fix extension loading with namespaces

2013-09-19 18:29:08 +02:00

content_visibility.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

datetime.php

[ticket/11700] Fix a few more comments

2013-09-16 04:45:58 +02:00

error_collector.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

filesystem.php

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26 15:34:44 +02:00

json_response.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

path_helper.php

[ticket/11852] Add class file

2013-09-27 00:08:54 +02:00

permissions.php

[ticket/11700] namespacify phpbb_permissions class

2013-09-16 06:30:50 +02:00

session.php

[ticket/11700] Get functional tests running after develop merge

2013-09-17 18:10:58 +02:00

symfony_request.php

[ticket/11700] Fix unit tests after develop merge

2013-09-17 17:12:41 +02:00

user_loader.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

user.php

[ticket/11700] And some last comments with backslashes

2013-09-16 05:00:18 +02:00