Nils Adermann 837ed8b6e1 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html

2014-08-11 17:38:29 +02:00

..

acp

Merge branch 'develop-ascraeus' into develop

2014-08-11 17:38:29 +02:00

diff

[ticket/12557] Fix pass by reference doc blocks

2014-08-07 11:39:04 +03:00

hooks

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

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

mcp

Merge branch 'develop-ascraeus' into develop

2014-08-11 07:32:27 +02:00

questionnaire

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

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

ucp

Merge branch 'develop-ascraeus' into develop

2014-08-11 17:38:29 +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/12957] Update the constructions of the template engine

2014-08-10 03:32:27 +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

Merge pull request #2730 from omniError/ticket/12831

2014-08-10 15:05:28 +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/12938] Remove the 'Download all attachments' feature.

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

functions_download.php

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

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

functions_install.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-07-30 15:01:16 +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 branch 'develop-ascraeus' into develop

2014-08-10 18:07:11 +02:00

functions_module.php

[ticket/12919] Use the modules basename as identifier for extension modules

2014-08-07 14:06:45 +02:00

functions_posting.php

[ticket/12718] Use remove_topic_from_statistic() for delete_topic

2014-08-07 17:19:14 +02:00

functions_privmsgs.php

Merge branch 'ticket/11480' into ticket/11480-ascraeus

2014-07-30 21:01:05 +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

[ticket/12941] Fix remaining Sami complaints.

2014-08-09 18:08:49 +02:00

functions_url_matcher.php

[ticket/12557] Fix php file description

2014-08-07 13:19:49 +03:00

functions_user.php

Merge pull request #2697 from n-aleha/ticket/12816

2014-07-07 00:20:27 +02:00

functions.php

Merge pull request #2842 from Nicofuma/ticket/11854

2014-08-11 12:20:35 +02:00

index.htm

…

message_parser.php

Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus

2014-08-07 12:06:33 +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