Oleg Pudeyev 87ea50948e Merge remote-tracking branch 'upstream/develop' into feature/prune-users ... * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php		2012-11-06 11:11:27 -05:00
..
info	[ticket/10631] Fix so it installs the module in the correct place	2012-09-01 15:05:10 +01:00
acp_attachments.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_ban.php	[ticket/11099] Mark acp_ban::display_ban_options() as static.	2012-10-30 18:43:00 -04:00
acp_bbcodes.php	[ticket/10271] AJAXified various deletions in the ACP.	2012-03-31 02:09:15 +02:00
acp_board.php	[ticket/11021] Add the option to specify a Site home URL and text	2012-07-22 22:26:38 -05:00
acp_bots.php	[ticket/10990] Changes for develop	2012-07-22 14:48:39 -05:00
acp_captcha.php	[ticket/11157] get_captcha_types is an instance method.	2012-10-29 14:48:42 -04:00
acp_database.php	Merge branch 'develop-olympus' into develop	2012-05-31 15:34:58 +02:00
acp_disallow.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_email.php	[ticket/10990] Do not use comma separator when storing it as a log.	2012-07-22 14:39:10 -05:00
acp_extensions.php	[ticket/10631] Fix a spelling typo	2012-09-01 17:32:59 +02:00
acp_forums.php	[feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum	2012-08-18 20:32:58 +02:00
acp_groups.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_icons.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_inactive.php	Merge remote-tracking branch 'upstream/develop' into feature/prune-users	2012-11-06 11:11:27 -05:00
acp_jabber.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_language.php	[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.	2012-09-08 14:42:38 +02:00
acp_logs.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_main.php	Merge branch 'develop-olympus' into develop	2012-05-01 13:38:25 +02:00
acp_modules.php	[feature/ajax] Unify phpbb_json_response instantiation	2012-03-31 02:10:17 +02:00
acp_permission_roles.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_permissions.php	[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate	2012-07-22 14:32:03 -05:00
acp_php_info.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_profile.php	[feature/php-events] Remove event core.acp_profile_field_edit	2012-08-05 14:50:33 +02:00
acp_prune.php	Merge remote-tracking branch 'upstream/develop' into feature/prune-users	2012-11-06 11:11:27 -05:00
acp_ranks.php	[ticket/10271] AJAXified various deletions in the ACP.	2012-03-31 02:09:15 +02:00
acp_reasons.php	[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate	2012-07-22 14:32:03 -05:00
acp_search.php	[ticket/11011] pass $auth to search backend constructor	2012-08-08 11:07:47 +05:30
acp_send_statistics.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_styles.php	[ticket/11041] Correctly import PHP file extension from global space.	2012-08-02 12:38:49 +02:00
acp_update.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
acp_users.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
acp_words.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
auth.php	[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate	2012-07-22 14:32:03 -05:00