Nathan Guse d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml

2012-11-14 11:33:24 -06:00

..

acp

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-11 04:42:06 -06:00

auth

[ticket/10780] Use L_COLON on LDAP page.

2012-11-10 00:38:25 +01:00

cache

[feature/compiled-dic] Split if() over multiple lines for improved readability

2012-11-10 11:40:09 +01:00

captcha

[ticket/11183] Remove $load_extensions and weird dl() calls

2012-11-10 11:25:22 +01:00

config

…

cron

[ticket/11152] Convert cron_task_collection to generic di_service_collection

2012-11-10 16:38:19 +01:00

db

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

di

[ticket/11194] Service tag data is stored in an array so access it correctly

2012-11-12 01:01:02 +01:00

diff

…

event

[feature/compiled-dic] Remove HttpKernel-related stuff

2012-11-10 11:40:10 +01:00

extension

[feature/compiled-dic] Purge cache to make ext services available right away

2012-11-10 12:02:55 +01:00

hooks

…

lock

…

mcp

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

notification

[ticket/11103] Make jabber use short/ email template files

2012-11-11 11:41:18 -06:00

php

…

questionnaire

[ticket/11183] Remove $load_extensions and weird dl() calls

2012-11-10 11:25:22 +01:00

request

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

search

[ticket/10780] Use L_COLON on search backend ACP pages.

2012-11-10 00:38:25 +01:00

style

[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.

2012-11-02 19:28:32 -04:00

template

Merge remote-tracking branch 'EXreaction/ticket/11189' into develop

2012-11-10 23:39:00 +01:00

ucp

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-11 04:42:06 -06:00

utf

…

.htaccess

…

bbcode.php

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04:00

class_loader.php

…

constants.php

[ticket/11103] Inject table prefix to notifications system instead of constants

2012-11-09 08:48:41 -06:00

datetime.php

…

error_collector.php

…

functions_acp.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

functions_admin.php

[ticket/11103] Use the full class name as the item_type/method

2012-10-20 20:58:53 -05:00

functions_compress.php

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

2012-11-06 16:43:48 -05:00

functions_container.php

[ticket/11195] Condense logic, remove improperly formatted if()

2012-11-12 16:16:40 -05:00

functions_content.php

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

functions_convert.php

…

functions_display.php

Merge remote-tracking branch 'EXreaction/ticket/8796' into develop

2012-10-18 16:43:46 +02:00

functions_download.php

…

functions_install.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

functions_jabber.php

…

functions_messenger.php

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04:00

functions_module.php

…

functions_posting.php

[ticket/11103] Revert an overwrite that occured on merging from develop

2012-10-29 18:18:33 -05:00

functions_privmsgs.php

[ticket/11103] Fix failed automerge

2012-11-10 11:20:06 -06:00

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_user.php

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

functions.php

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-11 04:42:06 -06:00

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

sphinxapi.php

…

startup.php

…

update_helpers.php

…

user.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00