Andreas Fischer 4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php

2015-01-20 23:11:29 +01:00

..

info

[ticket/13121] Remove cache mode from style management module

2014-10-01 00:03:54 -07:00

acp_attachments.php

Merge branch 'develop-olympus' into develop-ascraeus

2015-01-20 23:11:29 +01:00

acp_ban.php

[ticket/13119] Remove unused globals and use the request class

2014-09-30 18:22:06 +02:00

acp_bbcodes.php

[ticket/13492] Add the migration to update custom bbcodes with IDN regexps

2015-01-20 08:47:56 +07:00

acp_board.php

[ticket/11863] Display warning to user because of activation method

2014-10-17 15:42:11 +02:00

acp_bots.php

…

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/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

acp_disallow.php

…

acp_email.php

[ticket/13470] Fix non-empty username array if no usernames are given

2015-01-08 22:17:05 +01:00

acp_extensions.php

[ticket/13358] Correctly create version_helper in acp_extensions

2014-11-22 15:23:26 +01: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/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

acp_inactive.php

…

acp_jabber.php

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

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

acp_language.php

…

acp_logs.php

…

acp_main.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-10-20 23:20:42 +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

…

acp_profile.php

[ticket/12765] Execute query directly from db tools

2014-08-10 14:26:12 +02:00

acp_prune.php

[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.

2014-12-09 18:27:04 -08: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

…

acp_send_statistics.php

…

acp_styles.php

[ticket/10744] Fix some doc blocks

2014-11-21 23:59:29 +01:00

acp_update.php

…

acp_users.php

[ticket/13439] Update event version to 3.1.3-RC1

2015-01-04 01:38:50 -08:00

acp_words.php

…

auth.php

[ticket/10404] Fix codesniffer complaint about anonymous function

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