Nils Adermann 560a1b3ad4 Merge branch 'bug/nickvergessen/9047' into develop-olympus ...

* bug/nickvergessen/9047:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)

Conflicts:
	phpBB/docs/CHANGELOG.html

2010-04-04 15:31:38 +02:00

..

adm

[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)

2010-04-03 13:05:44 +02:00

cache

…

develop

Merge branch 'master' into develop-olympus

2010-03-06 02:29:04 +01:00

docs

Merge branch 'bug/nickvergessen/9047' into develop-olympus

2010-04-04 15:31:38 +02:00

download

#54245

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

files

…

images

removed executable props [Bug #6464]

2008-06-04 15:37:06 +00:00

includes

Merge branch 'bug/nickvergessen/59135' into develop-olympus

2010-04-01 18:55:16 +02:00

install

Merge branch 'master' into develop-olympus

2010-03-06 02:29:04 +01:00

language

Missed one half of bug #54855 whoops

2010-03-02 21:07:07 +01:00

store

39745 - permissions should handle it, but why not

2009-01-07 12:53:22 +00:00

styles

[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)

2010-04-04 02:03:23 +02: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

fail <3 r9769

2009-07-17 13:23:09 +00:00

cron.php

…

faq.php

populate who is online only where required

2009-08-12 10:30:37 +00:00

feed.php

Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into develop-olympus

2010-04-04 15:29:45 +02:00

index.php

fix r9604

2009-06-18 11:04:54 +00:00

mcp.php

fix mcp sorting for pm_reports, and some minor language changes

2009-07-22 13:33:54 +00:00

memberlist.php

Small text corrections. r10393

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

posting.php

Parse urls in signature taking into account the allow_sig_links config option introduced in phpBB 3.0.6, per bug #57105

2010-03-02 12:22:11 -08: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

We only remove board cookies (this is what the feature is supposed to do). This also solves issues with headers having > 20 Set-Cookie calls (which in turn breaks varnish 2.0.4-rc1 too)

2009-09-03 09:25:16 +00:00

viewforum.php

[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)

2010-04-04 12:23:07 +02:00

viewonline.php

Fix bug #46215 - Adjust viewonline filename regular expression to be less strict.

2009-06-09 15:52:03 +00:00

viewtopic.php

merge in r10509

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