Nathan Guse 51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 ... # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html		2013-01-15 11:31:39 -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	Merge remote-tracking branch 'Fyorl/ticket/10939' into develop	2012-11-10 23:49:29 +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/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