Marc Alexander a937e38bd5 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html

2016-02-27 10:54:48 +01:00

..

adm

[ticket/14315] Add functional tests for permission roles and fix non-js

2016-02-17 12:56:19 +01:00

assets

[ticket/14462] Make timeout error translateable

2016-02-14 16:16:33 +01:00

bin

Merge branch '3.1.x'

2016-01-15 11:18:13 +01:00

cache

…

config

[ticket/14457] Set the config values related to the RNG in the installer config

2016-02-18 17:30:31 +01:00

develop

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

docs

Merge branch '3.1.x' into 3.2.x

2016-02-27 10:54:48 +01:00

download

Merge branch '3.1.x'

2015-10-11 20:27:47 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

2016-02-26 23:11:16 +01:00

install

Update version for final 3.1.8 release

2016-02-18 17:59:26 +01:00

language

Merge pull request #4171 from CHItA/ticket/14462

2016-02-16 00:06:52 +01:00

phpbb

[ticket/14489] Fix bug where extension custom compiler pass cannot be found.

2016-02-18 23:56:53 -05:00

store

…

styles

Merge branch '3.1.x' into 3.2.x

2016-02-27 10:54:48 +01:00

.htaccess

[ticket/14458] Explicitly state RewriteBase into .htaccess root file

2016-02-07 14:46:45 +01:00

app.php

…

common.php

[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment

2015-12-11 21:05:53 +01:00

composer.json

[ticket/14457] Replaces unique_id implementation by random_bytes()

2016-02-18 17:30:31 +01:00

composer.lock

[ticket/14457] Replaces unique_id implementation by random_bytes()

2016-02-18 17:30:31 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

Merge branch '3.1.x'

2015-11-12 09:11:37 +01:00

mcp.php

…

memberlist.php

Merge branch '3.1.x'

2016-01-23 12:04:43 +01:00

posting.php

Merge branch '3.1.x'

2016-01-24 18:16:16 +01:00

report.php

…

search.php

[ticket/14234] Get rid of undefined variables

2015-10-12 21:56:09 +02:00

ucp.php

…

viewforum.php

Merge branch '3.1.x'

2015-11-24 21:46:01 +01:00

viewonline.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

viewtopic.php

Merge branch '3.1.x'

2015-11-26 14:27:57 +01:00

web.config

[ticket/13842] Prevent internal server errors without rewrite module on IIS

2016-02-19 17:01:58 +01:00