Tristan Darricau 71c4ffceec Merge branch '3.2.x' ...

* 3.2.x:
  [ticket/13502] Also cover passing object to resolver in tests
  [ticket/13502] Test getArguments() method of controller resolver
  [ticket/13502] Fix coding style
  [ticket/13502] Controller resolver should handle callable functions and objects

2016-04-03 16:04:59 +02:00

..

adm

Merge pull request #4021 from marc1706/ticket/14272

2016-03-27 13:34:17 +02:00

assets

Merge pull request #4021 from marc1706/ticket/14272

2016-03-27 13:34:17 +02:00

bin

Merge branch '3.1.x'

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

cache

…

config

Merge pull request #4199 from VSEphpbb/ticket/12684

2016-03-26 19:38:58 +01:00

develop

[ticket/13454] Remove unused variables

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

docs

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02:00

download

Merge branch '3.1.x'

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

ext

…

files

…

images

…

includes

[ticket/14426] Fixed undefined offset error

2016-04-03 10:27:23 +02:00

install

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02:00

language

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02:00

phpbb

Merge pull request #4266 from marc1706/ticket/13502

2016-04-03 16:04:59 +02:00

store

…

styles

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02:00

.htaccess

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

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

app.php

…

common.php

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:56:03 +02:00

composer.json

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02:00

composer.lock

[ticket/14495] Revert changes in master

2016-04-02 12:12:24 +02: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' into 3.2.x

2016-03-30 10:04:33 +02:00

posting.php

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:48:29 +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' into 3.2.x

2016-03-27 12:37:27 +02:00

viewonline.php

Merge branch '3.1.x' into 3.2.x

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

viewtopic.php

Merge pull request #4190 from marc1706/ticket/14437

2016-03-25 11:48:29 +01:00

web.config

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

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