forums/phpBB/language/en/acp/email.php, branch master

Merge branch 'develop-olympus' into develop-ascraeus

2014-09-24T19:24:29+00:00

* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php

[ticket/13086] String replaces 50 with 20

2014-09-24T17:03:33+00:00

PHPBB3-13086

[ticket/12594] Remove @package tags and update file headers

2014-05-27T18:51:13+00:00

PHPBB3-12594

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15T18:10:51+00:00

according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31T13:32:52+00:00

PHPBB3-9916

[ticket/9581] Mass e-mail to banned users

2011-03-04T10:10:08+00:00

Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.

PHPBB3-9581

#14621

2007-10-04T15:08:22+00:00

#14596
info file changes


git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0

#10799

2007-05-12T12:32:28+00:00

git-svn-id: file:///svn/phpbb/trunk@7546 89ea8834-ac86-4346-8a33-228a782c2dd0

some language-specific adjustements

2007-05-03T14:29:22+00:00

fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)


git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0

my take on getting the bugs down... thanks to those also providing (usable) solutions to the problem. ;) Of course also to those reporting generally...

2007-04-12T16:20:39+00:00

git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0