David King 29a904ce45 Merge branch 'develop-olympus' into develop ...

Conflicts:
	phpBB/language/en/acp/common.php

2012-03-29 20:43:03 -04:00

..

adm

[ticket/10645] Missing CSS for checkboxes

2012-02-13 12:28:01 +02:00

assets/javascript

[ticket/10155] Update to jQuery 1.6.2

2011-07-12 10:24:20 +02:00

cache

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

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

develop

Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop

2012-03-27 22:45:02 -04:00

docs

[task/php5.3] Updated range of tested PHP versions

2012-03-26 17:56:10 -04:00

download

[ticket/10633] Stop leaking filename of attachments when thumbnail is requested

2012-02-09 15:17:42 +01: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 remote-tracking branch 'Dickyf/ticket/10708' into develop-olympus

2012-03-29 00:51:12 +02:00

install

Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop

2012-03-27 22:45:02 -04:00

language

Merge branch 'develop-olympus' into develop

2012-03-29 20:43:03 -04:00

store

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

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

styles

Merge branch 'develop-olympus' into develop

2012-03-28 23:24:06 -04: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

[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2

2012-03-25 21:20:52 -04:00

cron.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

faq.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

feed.php

[ticket/10672] Fix total post count language string in statistics and feed

2012-02-27 19:13:31 +01:00

index.php

[ticket/10586] Tidy up comments

2012-03-27 19:57:32 -04:00

mcp.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

memberlist.php

Merge branch 'develop-olympus' into develop

2012-03-16 06:06:56 -04:00

posting.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

report.php

[feature/save-post-on-report] Changed the name of the column

2012-03-19 08:27:32 -04:00

search.php

Merge branch 'develop-olympus' into develop

2012-02-26 15:47:16 +01:00

ucp.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

viewforum.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:48:03 -05:00

viewonline.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:48:03 -05:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00