Andreas Fischer e2d27a30a6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10003] Fixed comment referring to db_tools duplication.
  [ticket/10003] Require db_tools.php in database_update.php.
  [ticket/10003] Use phpbb_db_tools in database_update.php.
  [ticket/10003] Delete the copy of db_tools in database_update.php.

Conflicts:
	phpBB/install/database_update.php

2011-07-09 16:01:54 +02:00

..

adm

Merge branch 'develop-olympus' into develop

2011-07-06 21:52:05 -04: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

2011-07-06 21:52:05 -04:00

docs

Merge branch 'develop-olympus' into develop

2011-07-07 20:29:25 +02:00

download

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02: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

[prep-release-3.0.9] Decreasing version for an RC4 release.

2011-07-07 20:19:11 +02:00

install

Merge branch 'develop-olympus' into develop

2011-07-09 16:01:54 +02:00

language

Merge branch 'develop-olympus' into develop

2011-06-22 02:32:45 +02: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

2011-07-07 20:06:26 +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

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

cron.php

[ticket/10046] Remove register_shutdown_function() in cron.php from develop.

2011-03-12 15:07:31 +01:00

faq.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

feed.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

index.php

[ticket/10173] Use correct variable, checking for $birthday_year was correct.

2011-05-11 11:21:37 +02:00

mcp.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

memberlist.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

posting.php

Merge branch 'develop-olympus' into develop

2011-06-10 00:26:41 +02:00

report.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

search.php

[ticket/9684] Fix Forum/Topic-Tracking for global announcements

2011-04-07 13:47:08 +02:00

style.php

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-05-13 01:29:57 +02:00

viewforum.php

Merge branch 'develop-olympus' into develop

2011-06-19 17:58:16 +02:00

viewonline.php

[ticket/9549] Enhance teampage and legend functionality

2011-02-16 18:21:49 +01:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-06-19 17:58:16 +02:00

web.config

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

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