Marc Alexander f09db1a7b4 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/config/services.yml

2014-08-11 12:23:21 +02:00

..

adm

Merge pull request #2720 from PayBas/ticket/12838

2014-08-07 16:13:35 +02:00

assets

Merge branch 'ticket/sumanai/12843' into develop-ascraeus

2014-07-27 19:51:38 +02:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

develop

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

docs

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

download

[ticket/12964] Correct use of undefined $row variable.

2014-08-10 15:54:56 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

install

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

language

[ticket/12938] Remove the 'Download all attachments' feature.

2014-08-09 16:33:59 +02:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2014-08-10 17:00:41 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

2014-07-07 01:02:37 +02:00

composer.json

[ticket/11528] Revert Mink changes

2014-08-09 17:18:33 +02:00

composer.lock

[ticket/11528] Revert Mink changes

2014-08-09 17:18:33 +02:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

[ticket/12804] Disable jabber from memberlist sort options

2014-07-08 00:42:01 +02:00

posting.php

[ticket/11854] Rename captchas.factory service to captcha.factory

2014-08-11 01:16:22 +02:00

report.php

[ticket/11854] Rename captchas.factory service to captcha.factory

2014-08-11 01:16:22 +02:00

search.php

…

ucp.php

…

viewforum.php

[ticket/12881] Checks earlier if server-side topic marking is enabled

2014-07-25 00:22:46 +02:00

viewonline.php

[ticket/12837] Use else if instead of elseif

2014-07-16 11:19:28 +02:00

viewtopic.php

[ticket/12938] Remove the 'Download all attachments' feature.

2014-08-09 16:33:59 +02:00

web.config

…