Joas Schilling c2a19235eb Merge branch 'develop-olympus' into develop ...

Conflicts:
	phpBB/includes/functions.php

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

..

acp

Merge branch 'develop-olympus' into develop

2011-11-17 12:46:00 -05: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

Merge branch 'develop' into feature/request-class

2011-08-18 22:31:25 +02:00

config

…

cron

…

db

Merge branch 'develop-olympus' into develop

2011-10-14 17:50:53 +02:00

diff

…

hooks

…

lock

…

mcp

Merge branch 'develop-olympus' into develop

2011-11-13 15:47:40 +01: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

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

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

template

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

2011-09-27 20:24:16 +02:00

ucp

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

2011-11-14 19:01:28 +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

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

class_loader.php

…

constants.php

[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP

2011-09-27 11:12:11 -07: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-09-18 23:25:57 +02:00

functions_module.php

…

functions_posting.php

[ticket/9608] Remove use of references in topic_review

2011-08-14 20:22:28 +02: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

…

index.htm

…

message_parser.php

Merge branch 'develop-olympus' into develop

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

session.php

[feature/remove-db-styles] Remove DB theme handling code from session.

2011-09-20 21:06:52 +01:00

startup.php

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

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