Andreas Fischer b78ae290e8 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

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

2015-01-30 13:14:33 +01:00

..

adm

…

assets

…

bin

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

cache

…

config

Merge pull request #3275 from nickvergessen/ticket/13487

2015-01-22 18:16:30 +01:00

develop

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

docs

Merge branch 'develop-ascraeus' into develop

2015-01-30 13:14:33 +01:00

download

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

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

ext

…

files

…

images

…

includes

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

2015-01-30 13:10:38 +05:30

install

Merge branch 'develop-ascraeus' into develop

2015-01-30 13:14:33 +01:00

language

…

phpbb

Merge branch 'develop-ascraeus' into develop

2015-01-30 13:14:33 +01:00

store

…

styles/prosilver

[prep-release-3.1.3] Update version to 3.1.2-RC1

2015-01-26 19:42:06 +01:00

.htaccess

…

app.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

common.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

composer.json

…

composer.lock

…

cron.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

faq.php

…

feed.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

index.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

mcp.php

…

memberlist.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

posting.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

report.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

search.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

viewforum.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

viewonline.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

viewtopic.php

Merge pull request #3289 from MGaetan89/ticket/13450

2015-01-14 12:34:28 +01:00

web.config

…