phpbb/phpBB/language/en
Nils Adermann 97e651a491 Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus
* github-exreaction/ticket/8323:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages

Conflicts:
	phpBB/language/en/ucp.php
2014-05-02 15:54:10 +02:00
..
acp Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus 2014-05-02 13:26:03 +02:00
email [ticket/12456] Fix missing new lines at the end of email templates 2014-04-29 15:43:55 +02:00
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 'github-nickvergessen/ticket/12371' into develop-ascraeus 2014-05-02 12:11:09 +02:00
groups.php [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code. 2014-04-29 17:51:21 +02:00
help_bbcode.php [ticket/12456] Add , after the last array element 2014-04-29 16:24:51 +02:00
help_faq.php [ticket/12456] Add , after the last array element 2014-04-29 16:24:51 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/9871] Update version check file to use json format 2014-02-19 16:13:23 -06:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php [ticket/12456] Add , after the last array element 2014-04-29 16:24:51 +02:00
memberlist.php [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM 2014-03-28 19:36:09 +01:00
migrator.php [ticket/11883] Report completed data step in migration as "Installing Data" 2013-10-02 14:27:46 -05:00
plupload.php [ticket/12206] Fix mismatched Plupload language vars preventing localization. 2014-02-17 12:33:19 -08:00
posting.php [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code. 2014-04-29 17:51:21 +02:00
search.php [ticket/12345] Improve search flood interval message for ascraeus 2014-04-16 02:14:36 +03:00
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 remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus 2014-05-02 15:54:10 +02:00
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [ticket/12389] Change language of email friend 2014-04-11 19:48:18 +02:00