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

..

acp

Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus

2014-07-04 21:08:20 +02:00

captcha

[ticket/10073] Deduplicate the if statement

2014-05-29 02:14:40 +02:00

diff

[ticket/12594] Replace phpBB Group with phpBB Limited

2014-05-28 01:07:56 +02:00

hooks

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp

Merge pull request #2701 from Nicofuma/ticket/12818

2014-07-11 11:53:38 +02:00

questionnaire

[ticket/12775] Remove useless includes of config.php

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

ucp

Merge pull request #2709 from rxu/ticket/12828

2014-07-16 16:15:30 +02:00

utf

[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset

2014-06-16 19:05:09 +02:00

.htaccess

…

bbcode.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

compatibility_globals.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

constants.php

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

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

functions_acp.php

[ticket/12687] Remove globals

2014-06-12 23:27:19 +02:00

functions_admin.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

functions_compatibility.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_compress.php

[ticket/12594] Replace phpBB Group with phpBB Limited

2014-05-28 01:07:56 +02:00

functions_content.php

[ticket/12013] Use the correct variable for the forum id.

2014-07-04 00:56:04 -07:00

functions_convert.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

functions_database_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_display.php

[ticket/12760] Fix wording for unapproved posts icon...

2014-06-24 20:47:51 -07:00

functions_download.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_install.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

functions_jabber.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_mcp.php

[ticket/12612] Prefix check_ids() with phpbb_

2014-06-23 23:01:52 +02:00

functions_messenger.php

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

2014-05-28 01:02:39 +02:00

functions_module.php

[ticket/12612] Prefix module url functions with phpbb_

2014-06-23 22:54:15 +02:00

functions_posting.php

[ticket/12612] Prefix upload_popup() with phpbb_

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

functions_privmsgs.php

Merge pull request #2574 from lucifer4o/ticket/12690

2014-06-23 19:46:50 +02:00

functions_transfer.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_upload.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-06-24 20:59:11 +02:00

functions_url_matcher.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_user.php

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

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

functions.php

[ticket/12854] Don't show contact page link if board emails are disabled

2014-07-15 22:19:56 +02:00

index.htm

…

message_parser.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

sphinxapi.php

[ticket/12721] Update rules descriptions

2014-06-16 23:07:28 +02:00

startup.php

[ticket/11266] Better message for when composer dependencies are missing.

2014-05-29 16:13:29 +02:00