Igor Wiedler d766ee3fe6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php

2011-11-20 18:45:56 +01:00

..

acp

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

auth

Merge branch 'develop-olympus' into develop

2011-10-14 03:56:55 +02:00

cache

Merge branch 'develop-olympus' into develop

2011-06-11 12:06:29 +02:00

captcha

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

config

[ticket/10139] Make signatures of set_atomic() consistent by using $new_value.

2011-04-19 10:17:18 +02:00

cron

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

db

Merge branch 'develop-olympus' into develop

2011-11-18 19:17:46 +01:00

diff

…

extension

[feature/extension-manager] Split disabling extensions up into steps as well

2011-11-18 18:24:18 +01:00

hooks

…

lock

[feature/system-cron] preg_match returns int so cast to bool, fix comment

2011-02-12 22:05:54 -05:00

mcp

Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop

2011-11-20 00:46:45 -05:00

questionnaire

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

request

[feature/request-class] Remove $html_encode arg, force manual decoding

2011-08-18 23:19:48 +02:00

search

[feature/extension-manager] Add docblocks to new search backend methods

2011-11-18 14:46:30 +01:00

template

[feature/extension-manager] Clear up docs of extension related template changes

2011-11-18 15:29:32 +01:00

ucp

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

utf

[ticket/9608] Revert changes to normalizer

2011-08-08 08:58:52 +02:00

.htaccess

…

auth.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:11:32 -04:00

bbcode.php

[feature/extension-manager] Refactoring the structure of extension provider

2011-09-29 16:15:53 +02:00

class_loader.php

[feature/extension-manager] Document what the class loader stores in cache

2011-11-18 16:00:22 +01:00

constants.php

[feature/extension-manager] Extension Manager & Finder

2011-09-29 15:42:33 +02:00

error_collector.php

[ticket/10369] Rename filter_errfile() to filter_root_path().

2011-09-18 22:32:25 +02:00

functions_acp.php

Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop

2011-10-20 20:46:48 -04:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-10-14 02:49:15 +02:00

functions_compress.php

…

functions_content.php

Merge branch 'develop-olympus' into develop

2011-08-21 14:26:37 +02:00

functions_convert.php

…

functions_display.php

Merge branch 'develop-olympus' into develop

2011-11-11 22:17:12 +01:00

functions_download.php

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

functions_install.php

Merge branch 'develop-olympus' into develop

2011-10-14 17:48:15 +02:00

functions_jabber.php

…

functions_messenger.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

functions_module.php

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

functions_posting.php

Merge remote-tracking branch 'naderman/feature/extension-manager' into develop

2011-11-19 01:20:22 +01:00

functions_privmsgs.php

Merge branch 'develop-olympus' into develop

2011-11-13 20:34:53 +01:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2011-06-09 12:47:27 +02:00

functions_transfer.php

Merge branch 'develop-olympus' into develop

2011-08-14 15:52:11 -04:00

functions_upload.php

…

functions_user.php

[ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.

2011-08-21 14:34:34 +02:00

functions.php

Merge branch 'develop-olympus' into develop

2011-11-18 15:28:37 +01:00

group_positions.php

[ticket/9549] New method move() to move a group more than 1 up/down.

2011-02-16 18:22:32 +01:00

index.htm

…

message_parser.php

Merge branch 'develop-olympus' into develop

2011-06-09 22:40:26 +02:00

session.php

[feature/extension-manager] Use "core files" instead of "global files" in docs

2011-11-18 14:48:39 +01:00

startup.php

[ticket/10420] Update includes/startup.php for PHP 5.4.

2011-10-18 21:16:42 +02:00