Joas Schilling bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission ... * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [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 [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [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 ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html		2013-07-11 11:41:48 +02:00
..
attachments.php	Merge branch 'develop-olympus' into develop	2012-05-31 11:55:12 +02:00
ban.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
board.php	[ticket/10325] fix acp language	2013-05-04 14:44:33 +05:30
bots.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
common.php	[ticket/9657] Correctly split disapproving from perma deleting posts	2013-03-11 16:37:43 +01:00
database.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
email.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
extensions.php	[ticket/10631] Use exceptions for errors. Build action list dynamically.	2012-09-01 15:05:34 +01:00
forums.php	[ticket/10650] Changed acp option from per forum to global	2012-04-08 10:34:44 +05:30
groups.php	[ticket/10411] Use template loops instead of defining the html in php files	2013-02-25 20:24:11 +01:00
index.htm	some bugfixes	2006-10-26 10:58:58 +00:00
language.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
modules.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
permissions.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
permissions_phpbb.php	[ticket/9657] Fix some language problems and inconsistences	2013-03-11 12:13:59 +01:00
posting.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
profile.php	Merge branch 'develop-olympus' into develop	2012-07-23 15:50:54 +02:00
prune.php	[ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language	2013-04-25 11:23:09 -05:00
search.php	Merge branch 'develop-olympus' into develop	2013-06-05 01:55:49 +05:30
styles.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
users.php	Merge branch 'develop-olympus' into develop	2012-07-21 16:15:42 +02:00