php-phpbb/includes at 2265811cd16f6473807f647cba4693c5366324c6 - php-phpbb - Irisnetwork

mirror/php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 01:25:33 +02:00

History

Marc Alexander 2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html

2012-11-12 14:57:28 +01:00

..

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

[ticket/10780] Use L_COLON on LDAP page.

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

[feature/avatars] Rewrite drivers to use full class name

2012-06-27 21:02:07 +02:00

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

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

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

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

…

[ticket/11152] Convert cron_task_collection to generic di_service_collection

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

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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

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

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

…

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

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

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

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

…

…

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

[ticket/10931] Apply strtolower() correctly, i.e. not on false.

2012-06-11 15:46:03 +02:00

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

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

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

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

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

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

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

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

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

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

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

…

.htaccess

…

bbcode.php

[ticket/10933] Dependency inject template context.

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

class_loader.php

…

constants.php

[feature/sphinx-fulltext-search] add sphinx_table constant to constants.php

2012-07-12 17:32:01 +05:30

datetime.php

[feature/new-tz-handling] Rename $user->tz back to $user->timezone

2012-07-18 16:52:52 +02:00

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/11052] update search backend constructor everywhere

2012-08-15 22:05:26 +05:30

functions_compress.php

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

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

functions_container.php

[ticket/11152] Compile the install container

2012-11-11 17:54:54 +01:00

functions_content.php

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

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

functions_convert.php

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

functions_display.php

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

functions_download.php

[feature/attach-dl] Optimised an sql query

2012-08-15 06:10:53 +08:00

functions_install.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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

functions_jabber.php

[ticket/11100] Mark can_use_ssl() and can_use_tls() as static.

2012-09-08 01:12:34 +02:00

functions_messenger.php

[ticket/10933] Dependency inject template context.

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

functions_module.php

…

functions_posting.php

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

2012-10-16 21:21:03 -04:00

functions_privmsgs.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-07-23 23:40:09 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/10939] Modified functions_upload to not use $_FILES

2012-08-15 15:00:03 +01:00

functions_user.php

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

functions.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

[ticket/10939] Modified message_parser.php to not use $_FILES

2012-08-15 15:06:37 +01:00

session.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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

sphinxapi.php

[feature/sphinx-fulltext-search] add sphinxapi.php file

2012-07-27 11:27:25 +05:30

startup.php

…

update_helpers.php

[ticket/11002] Use translating option to rename the Etc/GMT options

2012-07-21 15:18:16 +02:00

user.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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