Nils Adermann 82219d51c2 Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] ...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0

2010-02-24 00:08:13 +00:00

..

adm

propdel

2010-02-20 20:44:06 +00:00

cache

…

develop

fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns

2010-01-31 21:50:10 +00:00

docs

Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-24 00:08:13 +00:00

download

#54245

2009-11-21 09:14:07 +00:00

files

…

images

…

includes

Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)

2010-02-23 23:46:43 +00:00

install

Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-24 00:08:13 +00:00

language

Merging r10514 into 3.0.7: Bugs #53925 and #52085 - Language fixes related to the quick reply settings

2010-02-23 23:50:36 +00:00

store

…

styles

Merge r10488 into 3.0.7 branch. #57505

2010-02-18 01:31:06 +00:00

.htaccess

[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http

2010-01-19 19:08:51 +00:00

common.php

PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. [Bug #54495]

2009-12-06 02:30:24 +00:00

config.php

…

cron.php

…

faq.php

…

feed.php

Let's remove this warning again, since it for example also works quite well with the topic_id.

2010-01-24 16:06:23 +00:00

index.php

…

mcp.php

…

memberlist.php

Small text corrections. r10393

2009-12-31 17:32:49 +00:00

posting.php

#57715 - Correct behavior of "force_approved_state" when value is false.

2010-02-18 04:56:06 +00:00

report.php

Fix Bug #54375 - Show correct HTML title when reporting private messages.

2009-11-24 14:27:17 +00:00

search.php

Fix bug #51585 - Search loginbox or auth message differs

2010-01-18 15:50:13 +00:00

style.php

PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. [Bug #54495]

2009-12-06 02:30:24 +00:00

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

merge in r10509

2010-02-20 00:15:35 +00:00