Máté Bartus a01e3a0ffa Merge branch '3.1.x' into 3.2.x ...

* 3.1.x:
  [ticket/14132] Use transaction for adding notifications to type table
  [ticket/14519] Skip query if all unread notifications are retrieved
  [ticket/14483] Do not send headers by default on access via controller

Conflicts:
	phpBB/phpbb/notification/manager.php

2016-03-08 22:18:42 +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/14487] Add loading indicator while polling status

2016-02-29 16:40:09 +01:00

bin

Merge branch '3.1.x'

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

cache

…

config

Merge pull request #4196 from CHItA/ticket/14487

2016-03-01 21:52:05 +01:00

develop

[ticket/13454] Remove unused variables

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

docs

Merge pull request #4194 from Nicofuma/ticket/14499

2016-02-29 21:45:11 +01:00

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

2016-03-08 22:18:42 +01:00

install

[release-3.2.0-b2] Update versions to 3.2.0-3-dev

2016-03-07 17:36:16 +01:00

language

Merge branch '3.1.x' into 3.2.x

2016-03-05 12:12:27 +01:00

phpbb

Merge branch '3.1.x' into 3.2.x

2016-03-08 22:18:42 +01: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

…

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

…

ucp.php

…

viewforum.php

…

viewonline.php

Merge branch '3.1.x' into 3.2.x

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

viewtopic.php

…

web.config

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

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