Nils Adermann 693a2dc99b Merge branch 'develop-olympus' into develop ...

I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.

2010-03-03 23:32:09 +01:00

..

adm

Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. Patch by nn-

2010-02-25 10:51:35 +00:00

cache

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

develop

Merge branch 'develop-olympus' into develop

2010-03-03 23:32:09 +01:00

docs

Oops, forgot the changelog for #57105

2010-03-02 13:01:05 -08:00

download

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

files

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

images

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

includes

Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.

2010-03-02 21:12:35 +01:00

install

Merge branch 'develop-olympus' into develop

2010-03-03 23:32:09 +01:00

language

Missed one half of bug #54855 whoops

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

store

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

styles

Merge branch 'develop-olympus' into develop

2010-03-03 23:32:09 +01: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

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

config.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

cron.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

faq.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

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

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

mcp.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +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

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

search.php

Fix bug #51585 - Search loginbox or auth message differs

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

style.php

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

ucp.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

viewforum.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

viewonline.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

viewtopic.php

merge in r10509

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