phpbb/phpBB/language/en
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
..
acp Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
email [ticket/11471] Unrelated text in e-mail templates 2013-04-24 20:07:05 +02:00
mods [feature/sphinx-fulltext-search] integrate sphinx language keys with core 2012-07-12 17:31:49 +05:30
app.php [feature/controller] Remove unused language strings 2012-11-18 15:51:32 -05:00
captcha_qa.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
captcha_recaptcha.php [ticket/9975] Moved a few E_USER_ERROR errors to /language 2013-04-23 09:55:36 -07:00
common.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
help_bbcode.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
help_faq.php [ticket/10771] changed value in help_faq.php 2012-12-02 14:51:28 +05:30
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [feature/migrations] Remove hardcoded language, use lang instead. 2013-02-06 11:35:53 -06:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
memberlist.php [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01:00
migrator.php Merge remote-tracking branch 'EXreaction/ticket/11394' into develop 2013-03-04 15:10:48 -05:00
posting.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
search.php [ticket/11032] fix language of error displayed 2012-08-15 22:57:02 +05:30
search_ignore_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search_synonyms.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp.php [ticket/10325] fix language in acp and ucp 2013-04-30 22:59:32 +05:30
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 2012-11-03 23:37:35 +01:00