Joas Schilling 367bc23009 Merge branch 'develop-olympus' into develop ...

Conflicts:
	phpBB/includes/functions.php

2011-10-13 14:46:16 +02:00

..

acp

[feature/remove-db-styles] Remove forgotten template variables.

2011-09-20 23:15:30 +01:00

auth

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

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

cache

…

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-09-06 00:44:19 +02:00

diff

…

hooks

…

lock

…

mcp

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03: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

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03: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

[feature/remove-db-styles] Readd table constant for upgrades etc.

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

error_collector.php

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

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

functions_acp.php

…

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04: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-10-13 14:46:16 +02: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

…

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

[ticket/9661] Remove eval() from functions_privmsgs.php

2011-09-25 23:04:18 -07:00

functions_profile_fields.php

…

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-10-13 14:46:16 +02:00

group_positions.php

…

index.htm

…

message_parser.php

…

session.php

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

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

startup.php

[ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.

2011-06-25 17:42:52 +02:00