Andreas Fischer 1c95101284 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9933] Create unit test for word censor regular expression.
  [ticket/9933] Move word censor regex into separate function in functions.php
  [ticket/9933] Wrong handling consecutive multiple asterisks in word censor

Conflicts:
	phpBB/includes/cache.php

2011-01-07 15:58:10 +01:00

..

acm

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

acp

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

auth

Merge branch 'feature/igorw/request-class' into develop

2010-12-16 02:22:17 +01:00

captcha

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

db

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

diff

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

hooks

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

questionnaire

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

request

…

search

[ticket/9574] Add pcre_utf8_support() function

2010-12-28 22:37:33 +01:00

ucp

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

utf

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

auth.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

bbcode.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

cache.php

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

class_loader.php

…

constants.php

Merge branch 'ticket/igorw/9556' into develop

2010-12-13 16:35:55 +01:00

functions_admin.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_compress.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_content.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_convert.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

functions_display.php

Merge branch 'develop-olympus' into develop

2010-12-21 22:52:28 +01:00

functions_download.php

[ticket/9627] Prefix function names with 'phpbb_'.

2010-10-23 18:06:46 +02:00

functions_install.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_jabber.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_messenger.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_module.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_posting.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_privmsgs.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_profile_fields.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_template.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_transfer.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_upload.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_user.php

[ticket/9574] Add pcre_utf8_support() function

2010-12-28 22:37:33 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

index.htm

…

message_parser.php

Merge branch 'ticket/igorw/9556' into develop

2010-12-13 16:35:55 +01:00

session.php

[ticket/9746] Adding calls to phpbb_ip_normalise() from session management.

2011-01-03 00:09:51 +01:00

template.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:22:05 +01:00