Joas Schilling ba90746ce5 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html

2015-01-06 11:25:26 +01:00

..

adm

[ticket/13319] Add missing table tags

2014-11-24 20:48:15 +01:00

assets

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

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

bin

[ticket/12620] Add support of the environments for the ext routing files

2014-11-20 20:15:45 +01:00

cache

…

config

Merge pull request #3170 from Nicofuma/ticket/13266-develop

2014-12-27 13:31:16 +01:00

develop

[ticket/13421] Move tools to subdirectory

2014-12-06 17:10:07 +01:00

docs

Merge branch 'develop-ascraeus' into develop

2015-01-06 11:25:26 +01:00

download

[ticket/12620] Fix download/file.php and app.php outside of the root_path

2014-11-20 20:58:35 +01:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

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

install

Merge branch 'develop-ascraeus' into develop

2014-12-27 14:17:03 +01:00

language

Merge pull request #3225 from prototech/ticket/13302

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

phpbb

Merge branch 'develop-ascraeus' into develop

2015-01-06 10:48:34 +01:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2015-01-06 11:25:26 +01:00

.htaccess

…

app.php

[ticket/12620] Fix tests

2014-11-21 17:38:13 +01:00

common.php

[ticket/12620] Adds a yaml config file

2014-11-20 20:59:48 +01:00

composer.json

[ticket/13063] Adds Twig routing extension

2014-11-20 16:09:44 +01:00

composer.lock

[ticket/13063] Adds Twig routing extension

2014-11-20 16:09:44 +01:00

cron.php

…

faq.php

…

feed.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02: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/13158] Allow adding extra auth checks when the user is posting

2014-12-03 17:34:35 +00: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

[ticket/13449] Add viewforum event after the topic's been assigned to template

2015-01-03 20:12:47 +07:00

viewonline.php

[ticket/13051] Fix core event name

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

viewtopic.php

[ticket/13326] fix CS

2014-11-11 10:51:03 -06:00

web.config

…