Joas Schilling 1104f788c3 Merge branch 'develop-ascraeus' into develop ...

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

2014-11-21 21:00:00 +01:00

..

adm

Merge pull request #3150 from omniError/ticket/13347

2014-11-21 20:09:13 +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

[ticket/12620] Fix rebase

2014-11-20 23:15:49 +01:00

develop

[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback

2014-11-08 11:36:13 +01:00

docs

Merge branch 'develop-ascraeus' into develop

2014-11-21 20:09:27 +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

2014-11-21 21:00:00 +01:00

install

[ticket/12620] Use PHPBB_ENVIRONMENT

2014-11-20 19:01:23 +01:00

language

Merge pull request #2765 from Elsensee/ticket/11863

2014-11-21 20:18:15 +01:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-11-21 20:41:14 +01:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2014-11-21 21:00:00 +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

…

index.php

…

mcp.php

…

memberlist.php

[ticket/13265] Don't show link to edit own profile to those without permission

2014-11-05 21:06:32 +01:00

posting.php

[ticket/13182] Add posting.php core event to allow modifying the message text

2014-11-22 01:33:12 +07:00

report.php

…

search.php

[ticket/13253] Fix MCP queue link in active topics search.

2014-10-30 22:47:51 -07:00

ucp.php

…

viewforum.php

[ticket/13241] Fix pagination with global announcements

2014-10-29 13:42:42 +01:00

viewonline.php

…

viewtopic.php

[ticket/13326] fix CS

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

web.config

…