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

Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html

2015-10-08 14:44:58 +02:00

..

adm

Merge branch '3.1.x'

2015-09-16 11:58:53 +02:00

assets

[ticket/12769] Fix font permissions

2015-09-17 18:57:33 +02:00

bin

Merge pull request #3857 from Nicofuma/ticket/14124

2015-10-07 14:47:23 +02:00

cache

…

config

Merge pull request #3857 from Nicofuma/ticket/14124

2015-10-07 14:47:23 +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-10-08 14:44:58 +02:00

download

Merge branch '3.1.x'

2015-08-22 10:36:15 +02:00

ext

…

files

…

images

…

includes

[ticket/14222] Use request class instead of request_var in acp_users

2015-10-08 10:52:00 +02:00

install

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

install_new

[ticket/14124] Automatically translate exceptions in CLI

2015-08-25 22:24:28 +02:00

language

Merge pull request #3871 from Zoddo/ticket/10165

2015-10-07 15:08:08 +02:00

phpbb

Merge pull request #3857 from Nicofuma/ticket/14124

2015-10-07 14:47:23 +02:00

store

…

styles

Merge branch '3.1.x'

2015-10-08 14:44:58 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13740] Restore original install folder

2015-07-08 01:28:10 +02:00

composer.json

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

composer.lock

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

cron.php

…

faq.php

[ticket/13844] FAQ in new controller format

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

feed.php

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

index.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

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

memberlist.php

[ticket/12143] Fix those tests

2015-08-05 17:50:26 +02: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

…

viewforum.php

…

viewonline.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

viewtopic.php

Merge branch '3.1.x'

2015-10-07 16:50:43 +02:00

web.config

[ticket/13271] Fix URL Rewriting on IIS7

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