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

..

acp

Merge branch 'develop-olympus' into develop

2013-09-26 16:01:01 +02:00

captcha

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

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

db

[feature/passwords] Add schema changes to schema_data for new hash types

2013-09-27 10:48:00 +02:00

diff

…

hooks

…

mcp

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

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

questionnaire

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

ucp

[ticket/11868] Replace phpbb_request_interface references

2013-09-26 12:02:17 +03:00

utf

…

.htaccess

…

bbcode.php

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

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

constants.php

[prep-release-3.0.12] Bumping version number for 3.0.12 final.

2013-09-27 01:26:31 +02:00

functions_acp.php

[ticket/10999] Fix assets_version in ACP

2013-07-13 13:30:33 -04:00

functions_admin.php

[ticket/11700] Move all recent code to namespaces

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

functions_compatibility.php

[feature/avatars] Use deprecated for compatibility function

2013-02-03 23:06:30 +01:00

functions_compress.php

…

functions_container.php

[ticket/11866] More namespaces

2013-09-26 00:58:37 +02:00

functions_content.php

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

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

functions_convert.php

…

functions_database_helper.php

[ticket/11700] Move all recent code to namespaces

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

functions_display.php

[ticket/11700] Move all recent code to namespaces

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

functions_download.php

[ticket/11700] Move all recent code to namespaces

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

functions_install.php

[ticket/11700] Get the installer to run with namespaces

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

functions_jabber.php

Merge branch 'develop-olympus' into develop

2013-07-12 10:37:52 -05:00

functions_messenger.php

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

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

functions_module.php

[ticket/11700] Correctly load templates for extensions

2013-09-19 19:53:57 +02:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2013-09-02 12:31:27 +02:00

functions_privmsgs.php

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

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

functions_profile_fields.php

[ticket/11010] dealing with dimensions problem, removing extra code

2013-05-20 18:42:06 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/11700] Move all recent code to namespaces

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

functions_url_matcher.php

[ticket/11700] Move all recent code to namespaces

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

functions_user.php

[ticket/11862] Correct var names in user_delete() events due to prune-users

2013-09-27 13:32:37 +02:00

functions.php

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

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

index.htm

…

message_parser.php

[ticket/11700] Move all recent code to namespaces

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

sphinxapi.php

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

startup.php

…