Joas Schilling 71a015557f Merge pull request #3150 from omniError/ticket/13347 ...

[ticket/13347] missing acp_forums template events

Conflicts:
	phpBB/docs/events.md

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

…

cache

…

config

[ticket/13280] Output escaping for the symfony request object

2014-11-16 16:45:19 +01:00

develop

…

docs

Merge pull request #3150 from omniError/ticket/13347

2014-11-21 20:09:13 +01:00

download

…

ext

…

files

…

images

…

includes

Merge pull request #3131 from omniError/ticket/13328

2014-11-21 20:05:19 +01:00

install

Merge branch 'prep-release-3.1.1' into develop-ascraeus

2014-11-02 01:25:51 +01:00

language

[ticket/13083] Fix language string NO_ENTRIES for logs

2014-11-05 21:16:04 +01:00

phpbb

Merge pull request #3149 from prototech/ticket/13342

2014-11-18 16:28:59 +01:00

store

…

styles

Merge pull request #3126 from VSEphpbb/ticket/13290

2014-11-21 19:53:15 +01:00

.htaccess

…

app.php

…

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

…

composer.lock

Merge branch 'develop-olympus' into develop-ascraeus

2014-11-11 15:29:58 +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

…

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

…