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

* develop-olympus:
  [ticket/10334] Require permissions to view the birthday-list on board index

Conflicts:
	phpBB/index.php

2011-08-30 01:41:41 +02:00

..

adm

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

cache

…

develop

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

docs

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04:00

download

[feature/request-class] Add server(), header() and is_ajax() to request

2011-07-15 22:34:24 +02:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2011-08-29 21:00:13 +02:00

install

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +02:00

language

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

store

…

styles

Merge branch 'develop-olympus' into develop

2011-08-29 22:28:44 +02:00

.htaccess

…

common.php

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

2011-08-13 23:59:15 -04: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

Merge branch 'develop-olympus' into develop

2011-08-26 05:59:34 -04:00

index.php

Merge branch 'develop-olympus' into develop

2011-08-30 01:41:41 +02:00

mcp.php

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

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

memberlist.php

Merge branch 'develop-olympus' into develop

2011-08-18 17:46:31 -04:00

posting.php

[ticket/9608] Remove use of references in captcha and other places

2011-07-13 11:32:38 +02:00

report.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:28:55 -04:00

search.php

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

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

style.php

[feature/request-class] Adjust code base to do html decoding manually

2011-08-18 23:44:30 +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-07-16 21:57:16 -04:00

viewonline.php

[ticket/10290] Fixed malformed SQL query in viewonline.php

2011-08-04 23:16:23 -04:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-08-16 18:09:42 +02:00

web.config

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

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