Andreas Fischer 4f947ebb47 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.

Conflicts:
	phpBB/includes/functions_messenger.php

2012-12-05 10:03:29 +01:00

..

acp

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

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

auth

[ticket/10780] Use L_COLON on LDAP page.

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

cache

[ticket/10103] $rv had too few characters.

2012-12-04 13:45:02 -05:00

captcha

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

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

config

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

controller

[feature/controller] Allow injecting Symfony Request into controllers

2012-11-17 18:05:32 -05:00

cron

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

db

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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

di

[feature/controller] Don't use $user->lang() before container compilation

2012-11-18 15:51:05 -05:00

diff

…

event

[feature/controller] Fix comments, check against more general HttpException

2012-11-19 12:55:15 -05:00

extension

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

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

hooks

…

lock

[ticket/11247] Fix wrong property reference in flock class.

2012-12-05 01:54:29 -05:00

mcp

Merge PR #722 branch 'Senky/ticket/9918' into develop

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

php

…

questionnaire

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

request

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

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

search

[ticket/11174] include utf_tools in postgres search backend

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

style

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

template

[ticket/10103] Convert the rest of the tree to flock class.

2012-12-04 02:26:55 -05:00

ucp

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

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

utf

…

.htaccess

…

bbcode.php

[ticket/10933] Dependency inject template context.

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

class_loader.php

…

constants.php

…

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

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

functions_compress.php

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

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

functions_container.php

Merge PR #1088 branch 'igorw/ticket/11199' into develop

2012-11-15 09:07:41 -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

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

functions_install.php

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05: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

Merge branch 'develop-olympus' into develop

2012-12-05 10:03:29 +01:00

functions_module.php

[ticket/10601] Comment to help understanding the code

2012-11-28 19:37:16 +00:00

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_url_matcher.php

[feature/controller] Rename get_paths to import_paths_from_finder

2012-11-16 17:05:46 -05:00

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-olympus' into develop

2012-11-29 23:17:58 +01:00

group_positions.php

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

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

…

user.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

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