Nils Adermann 459570bcca Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php

2011-08-25 23:16:31 -04:00

..

acp

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

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

auth

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

2011-08-18 23:44:30 +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

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

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

cron

[ticket/10156] Fix new cron on windows.

2011-05-19 22:34:18 -04:00

db

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02: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

lock

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

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

mcp

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04: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

[feature/template-engine] Delete _get_locator function.

2011-08-13 23:49:54 -04:00

ucp

[ticket/9608] Remove blank line

2011-07-17 09:49:58 +02:00

utf

[ticket/9608] Revert changes to normalizer

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

.htaccess

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

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

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

[task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.

2011-01-09 23:49:44 +01:00

constants.php

[prep-release-3.0.9] Bumping version number for the final 3.0.9 release.

2011-07-05 00:40:45 +02:00

error_collector.php

[ticket/10057] Fixes for a bunch of small problems.

2011-03-08 19:48:56 -05:00

functions_acp.php

Merge branch 'develop-olympus' into develop

2011-06-10 01:24:16 +02:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04:00

functions_compress.php

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

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

functions_content.php

Merge branch 'develop-olympus' into develop

2011-08-21 14:26:37 +02: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

2011-08-25 23:16:31 -04: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

[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

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

2011-08-18 23:44:30 +02: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/9608] Remove use of references in topic_review

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

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

Merge branch 'develop-olympus' into develop

2011-01-10 23:43:04 +01:00

functions_user.php

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

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

functions.php

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

2011-08-21 14:34:34 +02: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/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02: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