Joas Schilling 9f59aa59d9 Merge branch 'prep-release-3.1.3' into develop-ascraeus ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql

2015-02-01 20:23:16 +01:00

..

adm

[ticket/13554] Show feature release upgrades in blue rather than red.

2015-01-28 21:59:03 +01:00

assets

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

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

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

Merge pull request #3293 from Nicofuma/ticket/13489

2015-01-20 23:27:54 +01:00

develop

Merge pull request #3272 from nickvergessen/ticket/13307

2015-01-10 13:06:46 +01:00

docs

[prep-release-3.1.3] Add changelog for 3.1.3-RC2

2015-01-31 01:08:29 +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

[prep-release-3.1.3] Update version to 3.1.3

2015-02-01 19:15:42 +01:00

install

[prep-release-3.1.3] Update version to 3.1.3

2015-02-01 19:15:42 +01:00

language

Merge pull request #3225 from prototech/ticket/13302

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

phpbb

[prep-release-3.1.3] Add migration for 3.1.3

2015-02-01 19:18:30 +01:00

store

…

styles

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

2015-01-26 19:42:06 +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

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

composer.lock

Merge branch 'develop-olympus' into develop-ascraeus

2014-11-11 15:29:58 +01:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

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/13490] Allow multibyte characters in edit reason

2015-01-11 19:29:33 +01: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

Merge pull request #3265 from tas2580/develop-ascraeus

2015-01-09 21:41:19 +01:00

viewonline.php

[ticket/13051] Fix core event name

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

viewtopic.php

[ticket/13160] New line before comment block

2015-01-11 19:12:08 +00:00

web.config

…