Joas Schilling 947ab91473 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2014-10-23 02:45:54 +02:00

..

adm

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

assets

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

bin

…

cache

…

config

Merge branch 'develop-ascraeus' into develop

2014-10-22 16:58:50 -04:00

develop

Merge branch 'develop-ascraeus' into develop

2014-10-07 20:30:40 +02:00

docs

Merge branch 'develop-ascraeus' into develop

2014-10-23 02:45:54 +02:00

download

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-10-23 02:45:54 +02:00

install

Merge branch 'develop-ascraeus' into develop

2014-10-23 02:45:54 +02:00

language

[ticket/13205] Add a mark all messages read link to PM folders

2014-10-22 18:02:43 -04:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-10-23 02:45:54 +02:00

store

…

styles/prosilver

[prep-release-3.1.0-RC6] Update version to 3.1.0-RC6

2014-10-23 01:48:38 +02: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

[ticket/13130] Updates dependencies to Symfony 2.5

2014-10-04 21:16:12 +02:00

composer.lock

[ticket/13130] Updates dependencies to Symfony 2.5

2014-10-04 21:16:12 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

index.php

…

mcp.php

…

memberlist.php

[ticket/12796] Use & in path

2014-10-14 12:58:07 +02:00

posting.php

[ticket/13123] Add events to allow modifying post data

2014-10-01 00:13:37 +02:00

report.php

…

search.php

Merge pull request #2978 from blitze/ticket/13071

2014-10-01 10:01:09 +02:00

ucp.php

…

viewforum.php

[ticket/13062] Fix name of "ORDER_BY" key in SQL array

2014-09-19 00:56:16 +02:00

viewonline.php

[ticket/13051] Fix core event name

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

viewtopic.php

[ticket/13186] Don't show link on post count when search disabled

2014-10-20 13:25:07 +02:00

web.config

…