phpbb/phpBB/language/en
Joas Schilling 948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
..
acp Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 2012-11-10 12:27:19 +01:00
email Merge PR #624 branch 'develop-olympus' into develop 2012-10-16 21:21:03 -04:00
mods [feature/sphinx-fulltext-search] integrate sphinx language keys with core 2012-07-12 17:31:49 +05:30
captcha_qa.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
captcha_recaptcha.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 2012-11-10 12:27:19 +01: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 Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling 2012-06-04 18:09:35 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) 2012-11-09 23:16:42 +01:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 2012-11-03 23:37:35 +01:00
memberlist.php Merge PR #753 branch 'Senky/ticket/10161' into develop 2012-04-26 22:57:30 -04:00
posting.php [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI) 2012-11-03 23:37:35 +01: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 Merge PR #918 branch 'develop-olympus' into develop 2012-10-17 22:31:35 -04:00
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