Marc Alexander 47ea6bc9e6 Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997 ...

Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml

2013-12-07 13:32:19 +01:00

..

acp

Merge remote-tracking branch 'Marc/ticket/11842' into develop

2013-12-04 17:20:20 +01:00

captcha

[task/code-sniffer] Replace spaces with tabs.

2013-10-30 13:37:29 +01:00

db

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth

2013-09-10 16:19:39 -04:00

diff

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

[ticket/11672] Move the reapply_sid() call before meta_refresh() is called.

2013-11-21 04:45:16 -08:00

questionnaire

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

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

ucp

[ticket/11842] Use avatar_data for obtaining driver that should be deleted

2013-12-04 15:42:17 +01:00

utf

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

bbcode.php

Merge branch 'develop-olympus' into develop

2013-12-02 10:07:49 +01:00

constants.php

[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant

2013-11-19 01:37:31 +01:00

functions_acp.php

[ticket/10910] Do not add size when its 1 (default)

2013-11-22 15:52:59 +01: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

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00

functions_container.php

[ticket/11866] More namespaces

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

functions_content.php

Merge remote-tracking branch 'brunoais/ticket/11663' into develop

2013-11-02 16:26:29 +01:00

functions_convert.php

[ticket/12005] Remove PM popup from converter

2013-11-08 21:57:05 +01:00

functions_database_helper.php

[ticket/11700] Move all recent code to namespaces

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

functions_display.php

[ticket/11241] Consolidate topic actions into "Topic tools" dropdown.

2013-12-06 00:56:24 -08:00

functions_download.php

[ticket/11700] Move all recent code to namespaces

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

functions_install.php

[ticket/12023] Correctly compare the size of the array in ignore_new_files

2013-11-19 00:23:49 +01:00

functions_jabber.php

Merge branch 'develop-olympus' into develop

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

functions_messenger.php

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00

functions_module.php

[ticket/12026] Remove root path, its prepended later

2013-12-03 18:10:20 +01:00

functions_posting.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +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

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_upload.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

functions_url_matcher.php

[ticket/11948] Allow resource importing for routing

2013-10-21 21:52:48 +02:00

functions_user.php

Merge remote-tracking branch 'Marc/ticket/11842' into develop

2013-12-04 17:20:20 +01:00

functions.php

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

2013-12-07 13:32:19 +01:00

index.htm

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

message_parser.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

sphinxapi.php

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

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

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00