Marc Alexander 1dba763e09 Merge branch 'ticket/14339' into ticket/14339-master ...

Conflicts:
	phpBB/composer.json
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html

2015-12-07 21:33:59 +01:00

..

adm

[ticket/14310] Put progress percentage inside span and make more visible

2015-12-07 16:51:39 +01:00

assets

[ticket/14310] Put progress percentage inside span and make more visible

2015-12-07 16:51:39 +01:00

bin

Merge pull request #3857 from Nicofuma/ticket/14124

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

cache

…

config

Merge pull request #4046 from CHItA/ticket/14269

2015-12-07 00:28:20 +01:00

develop

[ticket/14317] Make it easier to change the language iso tag

2015-11-28 11:36:05 +01:00

docs

Merge branch 'ticket/14339' into ticket/14339-master

2015-12-07 21:33:59 +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'

2015-12-07 21:06:39 +01:00

install

[ticket/14311] Use the iohandler for notices and warnings if possible

2015-12-01 18:50:20 +01:00

language

Merge pull request #4046 from CHItA/ticket/14269

2015-12-07 00:28:20 +01:00

phpbb

[ticket/14345] Move new line to ternary comparison

2015-12-07 16:59:04 +01:00

store

…

styles

Merge branch '3.1.x'

2015-11-26 14:45:36 +01:00

.htaccess

…

app.php

…

common.php

[ticket/14044] Deduplicate the installers

2015-10-22 21:29:52 +02:00

composer.json

Merge branch 'ticket/14339' into ticket/14339-master

2015-12-07 21:33:59 +01:00

composer.lock

[ticket/14341] Update dependencies to Symfony 2.8 stable

2015-12-06 16:21:14 +01:00

cron.php

…

faq.php

…

feed.php

[ticket/13645] Move the feeds to controllers

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

index.php

Merge branch '3.1.x'

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

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

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

memberlist.php

Merge branch '3.1.x'

2015-11-26 14:45:36 +01:00

posting.php

Merge branch '3.1.x'

2015-10-14 16:27:02 +02: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'

2015-10-12 09:20:13 +02:00

viewtopic.php

Merge branch '3.1.x'

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

web.config

…