Marc Alexander b677bc41c9 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_view.html
	phpBB/styles/subsilver2/template/viewtopic_body.html

2015-07-23 12:12:03 +02:00

..

adm

Merge branch '3.1.x'

2015-07-22 10:38:35 +02:00

assets

Merge branch '3.1.x'

2015-07-10 13:14:08 +02:00

bin

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

cache

…

config

[ticket/13986] Add --resume option to reparser CLI

2015-07-17 11:53:28 +02:00

develop

[ticket/8708] Add f_announce_global permission

2015-07-19 21:26:47 +02:00

docs

Merge branch '3.1.x'

2015-07-23 12:12:03 +02:00

download

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

ext

…

files

…

images

…

includes

Merge pull request #3781 from Elsensee/ticket/8708-2

2015-07-22 11:30:50 +02:00

install

[ticket/8708] Add f_announce_global permission

2015-07-19 21:26:47 +02:00

language

Merge pull request #3781 from Elsensee/ticket/8708-2

2015-07-22 11:30:50 +02:00

phpbb

Merge pull request #3781 from Elsensee/ticket/8708-2

2015-07-22 11:30:50 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-07-23 12:12:03 +02: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/13770] Fix tests

2015-05-14 23:04:23 +02:00

composer.json

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

composer.lock

[ticket/14015] Update Symfony

2015-07-17 09:51:49 +02:00

cron.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

faq.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

feed.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

index.php

[ticket/11444] Moving the in-board notifications to a method class

2015-07-13 22:41:13 +02:00

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

2015-07-19 21:26:47 +02:00

memberlist.php

[ticket/13455] Remove request_var() references from comments

2015-02-03 20:56:48 +01:00

posting.php

Merge pull request #3781 from Elsensee/ticket/8708-2

2015-07-22 11:30:50 +02:00

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

Merge branch '3.1.x'

2015-07-23 10:20:10 +02:00

ucp.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

viewforum.php

Merge branch '3.1.x'

2015-03-06 13:45:12 +01:00

viewonline.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

viewtopic.php

[ticket/8708] Apply permission 'f_announce_global'

2015-07-19 21:26:47 +02:00

web.config

[ticket/13271] Fix URL Rewriting on IIS7

2015-03-23 18:23:12 +01:00