aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/email.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-09-241-1/+1
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/13086] String replaces 50 with 20 Conflicts: phpBB/language/en/acp/email.php
| * [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
| | | | | | | | PHPBB3-13086
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+6
| | | | | | | | PHPBB3-12594
* | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-151-3/+3
| | | | | | | | | | | | | | 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$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-2/+4
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| * [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-041-2/+4
| | | | | | | | | | | | | | | | | | 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
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | Copy 3.0.x branch to trunkMeik Sievertsen2009-10-041-0/+67
| | | | | | | | git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Move trunk/phpBB to old_trunk/phpBB Meik Sievertsen2009-10-041-67/+0
|/ | | | git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
* #14621Meik Sievertsen2007-10-041-3/+8
| | | | | | | | #14596 info file changes git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
* #10799David M2007-05-121-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7546 89ea8834-ac86-4346-8a33-228a782c2dd0
* some language-specific adjustementsMeik Sievertsen2007-05-031-2/+2
| | | | | | | | 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) ↵Meik Sievertsen2007-04-121-1/+1
| | | | | | solutions to the problem. ;) Of course also to those reporting generally... git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0
* fixing some bugsMeik Sievertsen2007-02-181-1/+1
| | | | | | | | more mcp links for easier moderating different aspects (all, forum, topic) i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected. git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
* - fix some oddities (doubled spaces for example)Meik Sievertsen2007-01-261-1/+1
| | | | | | | | | | - changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier. - Changed some permission namings based on suggestions by the community - Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time. - Disable submit buttons after clicking for installation and conversions. git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
* fixing some bugs, most being submitted grammatical/spelling errors.Meik Sievertsen2007-01-211-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bertiezilla make Bertie-smash on language files!Jonathan Stanley2006-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6244 #6278 #6284 #6286 #6336 #6340 #6342 #6344 #6346 #6352 #6358 #6364 #6376 #6382 #6386 #6388 #6418 #6420 #6426 #6428 #6430 #6434 #6452 #6454 #6458 git-svn-id: file:///svn/phpbb/trunk@6790 89ea8834-ac86-4346-8a33-228a782c2dd0
* #6094Meik Sievertsen2006-12-101-2/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@6737 89ea8834-ac86-4346-8a33-228a782c2dd0
* - a bunch of fixesMeik Sievertsen2006-12-021-1/+1
| | | | | | | - added todos to the updater to make sure i do not forget. :) git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
* Righto... my first checkin for these language related thingies. Hopefully ↵Jonathan Stanley2006-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | | nothing has blown up! ;) The basic style guide is: 1) British English, Cambridge style... ie: -ise, not -ize, etc. 2) Sentence-case pervasively with exception of acronyms/abbreviations, which if not in their contracted form, shall be in title-case. If you don't like it, you can restyle it via CSS using text-transform: none|uppercase|lowercase|capitalize; ... additional hooks may be added to the strings to assist this. 3) For those that have missed the switch to UTF-8, it means that the language files need not use numeric entities anymore. <, > and & stay though, as they must always be entitised. There'll be more tweaks and changes, though this "big 'un" is out of the way and will get progressively chilly so that it can be frozen for RC1 after however many betas there may be. ;) Wooh! :P git-svn-id: file:///svn/phpbb/trunk@6399 89ea8834-ac86-4346-8a33-228a782c2dd0
* - no more encoding mixture, say hello to UTF-8 (I'll add a validation ↵Nils Adermann2006-09-171-1/+3
| | | | | | | | | | | | solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762] - take local server time into consideration for birthday/age calculation - faster active topic search - allow changing active topic time frame [Bug #4150] - reload stylesheet on language change [Bug #4222] git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0
* some fixes.Meik Sievertsen2006-08-251-1/+1
| | | | | | | | | | | | | David, could you check the pass_complex expressions? They are: .* PASS_TYPE_ANY (any characters are allowed, no check) [a-zA-Z] PASS_TYPE_CASE (password must contain alphanumerics) [a-zA-Z0-9] PASS_TYPE_ALPHA (password must contain alphanumerics and numbers) [a-zA-Z\W] PASS_TYPE_SYMBOL (password must contain alphanumers, numbers and symbols) At the moment the pass complexity check is done within validate_password(), but the expressions are wrong. :) git-svn-id: file:///svn/phpbb/trunk@6317 89ea8834-ac86-4346-8a33-228a782c2dd0
* #1232Meik Sievertsen2006-03-251-1/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@5719 89ea8834-ac86-4346-8a33-228a782c2dd0
* - forum administration (now working and modified for easier handling the ↵Meik Sievertsen2005-12-121-2/+2
| | | | | | | | | different forum types [UI]) - Changed += for arrays into array_merge. We do not want to append, we want to merge. ;) git-svn-id: file:///svn/phpbb/trunk@5330 89ea8834-ac86-4346-8a33-228a782c2dd0
* - mass emailMeik Sievertsen2005-12-051-0/+59
git-svn-id: file:///svn/phpbb/trunk@5321 89ea8834-ac86-4346-8a33-228a782c2dd0