Nathaniel Guse 54e9f7b50a Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103 ... # By Nathan Guse (28) and others # Via Andreas Fischer (9) and others * 'develop' of https://github.com/phpbb/phpbb3: (90 commits) [ticket/11350] Do not pass $db by reference; typehint phpbb_db_driver [feature/migrations] Remove default values from necessary parameters [ticket/11201] Revert WLM dropping because it is still used in China. [ticket/11220] Improvement to the info pop-up from "list=" [feature/migrations] Revert unrelated changes to functions.php [ticket/11233] prohibit selecting anonymous user as a PM recipient [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input. [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. [ticket/10050] removing prosilver edits [ticket/9737] Fix some comments [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. [ticket/11338] Travis CI: Install PHP extension for redis key-value store. [ticket/10050] adding .topicrow to template condition [ticket/9737] Fix a few minor things in migrations ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml		2013-02-11 21:37:15 -06:00
..
info	[ticket/11088] Move style, extension and language pack management to customise	2012-12-12 11:39:14 -05: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/11103] ACP option to enable/disable notifications output in header	2012-10-05 13:43:03 -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	[ticket/10758] Dependency inject parameters into cache_moderators.	2012-12-15 16:50:28 -05:00
acp_groups.php	[ticket/9492] Ensure to update all avatar values when the avatar is changed	2013-01-17 14:43:00 +01: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	[ticket/10758] Dependency inject parameters into cache_moderators.	2012-12-15 16:50:28 -05:00
acp_modules.php	[ticket/11305] Retrieve cache driver from container rather than cache service.	2013-01-02 01:29:32 -05: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/10758] Extract obtain_user_data for the benefit of tests.	2012-12-19 21:50:35 -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/11259] htmlspecialchars($phpbb_admin_path)	2012-12-10 21:16:08 -06: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/10758] Dependency inject parameters into cache_moderators.	2012-12-15 16:50:28 -05: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/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01: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