Andreas Fischer 3f0c02533a Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
  [ticket/9012] Adjust shadow topic title to the title at the time it was moved.

Conflicts:
	phpBB/styles/subsilver2/template/editor.js
	phpBB/styles/subsilver2/template/posting_topic_review.html
	phpBB/styles/subsilver2/template/ucp_pm_history.html

2010-07-12 00:13:32 +02:00

..

adm

[ticket/9695] Correct the improper display of user input in mcp_ban.php

2010-07-01 17:48:32 -05:00

cache

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

develop

Merge branch 'develop-olympus' into develop

2010-05-16 19:52:36 +02:00

docs

Merge branch 'develop-olympus' into develop

2010-07-08 20:10:17 +02:00

download

[ticket/7782] Send status line using refactored download/file.php logic.

2010-05-16 18:24:26 -04:00

files

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

images

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

includes

Merge branch 'develop-olympus' into develop

2010-07-11 01:54:03 +02:00

install

Merge branch 'develop-olympus' into develop

2010-07-11 01:54:03 +02:00

language

Merge branch 'ticket/jellydoughnut/9650' into develop-olympus

2010-07-10 21:22:16 +02:00

store

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

styles/prosilver

Merge branch 'develop-olympus' into develop

2010-07-12 00:13:32 +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

[feature/auto-loading] Added autoloader to common and ensured compatability

2010-07-05 15:40:46 +02: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

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

2010-04-04 15:29:45 +02: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

Merge branch 'ticket/nickvergessen/9531' into develop-olympus

2010-05-16 19:13:32 +02:00

report.php

merge changes from 3.0.x branch

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

search.php

[ticket/9606] Optimize unread search option.

2010-05-17 21:14:02 +08:00

style.php

[ticket/9629] Allow style.php to retrieve its session ID from cookies

2010-07-11 01:35:01 +02:00

ucp.php

Copy 3.0.x branch to trunk

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

viewforum.php

[ticket/9012] Adjust shadow topic title to the title at the time it was moved.

2010-07-11 02:44:07 +02:00

viewonline.php

Copy 3.0.x branch to trunk

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

viewtopic.php

[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.

2010-03-18 17:22:30 +00:00

web.config

[ticket/9520] Additionally filter requests for {common,config}.php

2010-05-03 19:32:29 +02:00