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

..

info

Merge branch 'develop-ascraeus' into develop

2014-06-22 11:35:13 +02:00

acp_attachments.php

[ticket/12557] Fix doc block errors found by Sami

2014-08-03 07:13:20 +03:00

acp_ban.php

[ticket/12891] Replace template loops with 1 loop to reduce generation time

2014-07-25 13:27:49 +02:00

acp_bbcodes.php

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

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

acp_board.php

[ticket/12826] Add optional root namespace indicator for consistency.

2014-08-07 14:25:53 +02:00

acp_bots.php

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

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

acp_captcha.php

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

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

acp_contact.php

[ticket/12723] Add Sniff ensuring PHP files use the correct file header

2014-06-22 00:45:34 +02:00

acp_database.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_disallow.php

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

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

acp_email.php

[ticket/10073] Deduplicate the if statement

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

acp_extensions.php

[ticket/12847] Allow the extensions to say if they can be enabled

2014-07-13 18:09:34 +02:00

acp_forums.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_groups.php

[ticket/12822] Add method for deleting avatars and use confirm_box

2014-08-07 17:29:33 +02:00

acp_icons.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_inactive.php

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

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

acp_jabber.php

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

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

acp_language.php

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

2014-05-27 21:55:40 +02:00

acp_logs.php

[ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs

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

acp_main.php

[ticket/12896] Add php event for admin notices

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

acp_modules.php

[ticket/12557] Fix doc block errors found by Sami

2014-08-03 06:57:05 +03:00

acp_permission_roles.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_permissions.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_php_info.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-06-09 13:23:49 +05:30

acp_profile.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_prune.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_ranks.php

[ticket/12838] Update RC2 to RC3

2014-07-16 22:05:28 +02:00

acp_reasons.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

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

acp_search.php

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

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

acp_send_statistics.php

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

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

acp_styles.php

[ticket/12901] Fix another wrong type hint for $level

2014-08-03 22:42:17 +02:00

acp_update.php

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

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

acp_users.php

Merge branch 'develop-ascraeus' into develop

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

acp_words.php

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

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

auth.php

[ticket/10404] Fix codesniffer complaint about anonymous function

2014-08-08 14:01:04 +02:00