Marc Alexander cd85f1b632 Merge branch 'ticket/13568' into ticket/13568-asc ...

Conflicts:
	phpBB/adm/index.php
	phpBB/includes/acp/acp_attachments.php

2015-02-06 10:19:39 +01:00

..

adm

[ticket/13568] Also check if absolute_path_writable is writable

2015-02-06 10:15:36 +01:00

assets

[ticket/13277] Force IE to not cache AJAX requests.

2014-11-18 00:41:57 -08:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

Merge pull request #3293 from Nicofuma/ticket/13489

2015-01-20 23:27:54 +01:00

develop

Merge pull request #3272 from nickvergessen/ticket/13307

2015-01-10 13:06:46 +01:00

docs

Merge pull request #3302 from rxu/ticket/13512

2015-02-02 23:05:50 +01:00

download

[ticket/13414] Set Content-Length header only if status is not 304

2015-01-28 15:50:48 +01:00

ext

[ticket/11163] Add ext/index.htm

2014-05-15 14:11:11 +02:00

files

…

images

…

includes

Merge branch 'ticket/13568' into ticket/13568-asc

2015-02-06 10:19:39 +01:00

install

[ticket/13569] Add missing sql_freeresults and remove unneeded results

2015-02-02 17:36:39 +01:00

language

Merge pull request #3225 from prototech/ticket/13302

2014-12-27 14:12:23 +01:00

phpbb

Merge branch 'ticket/13348-olympus' into ticket/13348

2015-02-03 18:30:45 +01:00

store

…

styles

Merge pull request #3302 from rxu/ticket/13512

2015-02-02 23:05:50 +01:00

.htaccess

…

app.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

common.php

[ticket/13070] Adjust template hook name to match that provided in the class.

2014-10-20 19:59:56 -07:00

composer.json

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

composer.lock

Merge branch 'develop-olympus' into develop-ascraeus

2014-11-11 15:29:58 +01:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

faq.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

feed.php

[ticket/13348] Remove unnecessary global $cache

2015-02-03 18:24:16 +01:00

index.php

[ticket/12885] New if for Index-page - board-index-text switch

2014-11-22 00:09:38 +01:00

mcp.php

[ticket/13142] Extra space before the comment block

2014-11-29 10:40:35 +00:00

memberlist.php

[ticket/13428] Add core events to memberlist.php for teampage

2015-01-06 11:01:18 +01:00

posting.php

[ticket/13490] Allow multibyte characters in edit reason

2015-01-11 19:29:33 +01:00

report.php

[ticket/13159] Allow to do extra auth checks on report posting

2014-12-03 17:53:10 +00:00

search.php

Merge pull request #3216 from kinerity/ticket/13409

2014-12-27 14:01:05 +01:00

ucp.php

[ticket/13422] Renamed event

2014-12-28 13:20:04 +04:00

viewforum.php

Merge pull request #3265 from tas2580/develop-ascraeus

2015-01-09 21:41:19 +01:00

viewonline.php

[ticket/13051] Fix core event name

2014-09-09 13:12:29 -07:00

viewtopic.php

[ticket/13160] New line before comment block

2015-01-11 19:12:08 +00:00

web.config

…