Igor Wiedler 38c65da553 Merge branch 'develop' into feature/request-class ... * develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9608] Remove use of references in topic_review [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. [ticket/10312] Un-check the shadow option while moving. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. ... Conflicts: phpBB/includes/functions.php		2011-08-18 22:31:25 +02:00
..
info	[feature/attachment-management-no-reassignment] Further feature adjustments.	2011-04-11 20:16:59 +08:00
acp_attachments.php	[feature/attachment-management-no-reassignment] Handle privacy and some more.	2011-04-24 23:33:51 +08:00
acp_ban.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_bbcodes.php	Merge branch 'develop-olympus' into develop	2011-02-23 22:03:42 -05:00
acp_board.php	Merge branch 'develop-olympus' into develop	2011-06-16 16:11:38 +02:00
acp_bots.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_captcha.php	[ticket/9608] Remove use of references in captcha and other places	2011-07-13 11:32:38 +02:00
acp_database.php	[feature/request-class] Add server(), header() and is_ajax() to request	2011-07-15 22:34:24 +02:00
acp_disallow.php	Merge branch 'develop-olympus' into develop	2011-03-23 23:21:36 +01:00
acp_email.php	Merge branch 'develop-olympus' into develop	2011-04-10 14:17:56 -04:00
acp_forums.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_groups.php	[ticket/9549] Throw an error when the given field-name is invalid.	2011-02-16 18:22:30 +01:00
acp_icons.php	Merge branch 'develop-olympus' into develop	2011-04-08 12:24:59 +02:00
acp_inactive.php	Merge branch 'develop-olympus' into develop	2011-07-16 21:00:14 -04:00
acp_jabber.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_language.php	Merge branch 'develop-olympus' into develop	2011-02-04 17:41:39 +01:00
acp_logs.php	Merge branch 'develop-olympus' into develop	2011-07-16 21:00:14 -04:00
acp_main.php	Merge branch 'develop-olympus' into develop	2011-07-16 22:46:39 -04:00
acp_modules.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_permission_roles.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_permissions.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_php_info.php	Merge branch 'develop-olympus' into develop	2011-07-30 18:55:32 -04:00
acp_profile.php	[ticket/8542] Display custom profile fields in private messages	2011-05-20 16:45:29 +02:00
acp_prune.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_ranks.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_reasons.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00
acp_search.php	[ticket/9684] Remove code in some more files especially includes/	2011-04-07 13:47:06 +02:00
acp_send_statistics.php	[task/whitelist-code-coverage] Load all of includes/ into code coverage report	2011-08-07 20:14:53 -04:00
acp_styles.php	Merge branch 'develop-olympus' into develop	2011-07-07 20:06:26 +02:00
acp_update.php	Merge branch 'develop-olympus' into develop	2011-07-16 22:22:35 -04:00
acp_users.php	Merge branch 'develop-olympus' into develop	2011-07-16 21:00:14 -04:00
acp_words.php	Merge branch 'develop-olympus' into develop	2011-01-07 15:58:10 +01:00
auth.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00