Nathaniel Guse 35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig ... # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...		2013-07-04 11:19:10 -05:00
..
convertors	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
data	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
schemas	Merge remote-tracking branch 'EXreaction/ticket/11413' into develop	2013-05-20 11:54:39 -04:00
database_update.php	[ticket/11570] Fix link and make the notice more conspiciuous	2013-05-31 12:18:03 +02:00
index.php	[feature/twig] Remove resource locator dependency from template	2013-07-01 13:28:08 -05:00
install_convert.php	Merge branch 'develop-olympus' into develop	2013-05-12 23:09:41 +02:00
install_install.php	[feature/auth-refactor] Fix the actual cause of test failures	2013-07-01 22:40:49 -04:00
install_main.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
install_update.php	Merge branch 'develop-olympus' into develop	2013-06-06 12:56:36 -05:00
phpinfo.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00