Oliver Schramm 1e0775a3da Merge branch 'ticket/10729' into ticket/10729-2 ...

Conflicts:
	phpBB/includes/functions_user.php

2014-07-18 00:17:20 +02:00

..

adm

[ticket/12810] Use correct template vars for shadow pruning settings

2014-07-06 18:03:09 +02:00

assets

Merge pull request #2731 from callumacrae/ticket/12849-2

2014-07-14 19:27:27 +02:00

bin

[ticket/12685] Setup class loader for extensions only if not in safe mode

2014-07-17 00:05:33 +02:00

cache

…

config

[ticket/12685] Add a new line

2014-07-15 11:27:58 +02:00

develop

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02:00

docs

Merge pull request #2747 from Elsensee/ticket/12860

2014-07-17 15:31:20 +02:00

download

[ticket/12775] Fix container_builder

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

ext

…

files

…

images

…

includes

Merge branch 'ticket/10729' into ticket/10729-2

2014-07-18 00:17:20 +02:00

install

[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development

2014-07-11 17:22:16 +02:00

language

Merge pull request #2576 from carlo94it/ticket/12685

2014-07-17 16:03:55 +02:00

phpbb

Merge pull request #2576 from carlo94it/ticket/12685

2014-07-17 16:03:55 +02:00

store

…

styles

Merge pull request #2747 from Elsensee/ticket/12860

2014-07-17 15:31:20 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

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

composer.json

[ticket/12788] Force 2.3.* on symfony dependencies

2014-07-03 20:50:06 +05:30

composer.lock

[ticket/12788] Force 2.3.* on symfony dependencies

2014-07-03 20:50:06 +05:30

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12804] Disable jabber from memberlist sort options

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

posting.php

[ticket/12612] Prefix upload_popup() with phpbb_

2014-06-23 22:49:00 +02:00

report.php

…

search.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02:00

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/12837] Use else if instead of elseif

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

viewtopic.php

[ticket/12013] Fix functional tests and sniffer issue.

2014-07-04 01:22:32 -07:00

web.config

…