aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/email
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-10/+0
|\ | | | | Group join approved notification
| * [ticket/11745] Group request approved notificationNathan Guse2013-07-271-10/+0
| | | | | | | | PHPBB3-11745
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-023-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/includes/functions_posting.php
| * \ Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-023-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11769] Allow '0' as username in notification mails [ticket/11769] Fix language issues in the doc blocks [ticket/11769] Correctly supply the post author's username in posting.php Conflicts: phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| | * | [ticket/11769] Allow '0' as username in notification mailsJoas Schilling2013-08-233-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11769
| * | | [ticket/11821] Fix comma usage next to "You are receiving this notification".Andreas Fischer2013-09-023-3/+3
| |/ / | | | | | | | | | | | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+1
|\ \ \ | |/ / | | / | |/ |/| * develop-olympus: [ticket/11752] HTTP -> HTTPs in email/installed.txt
| * [ticket/11752] HTTP -> HTTPs in email/installed.txtAndreas Fischer2013-07-301-1/+1
| | | | | | | | PHPBB3-11752
* | [ticket/11471] Unrelated text in e-mail templatesGaëtan Muller2013-04-2420-54/+10
| | | | | | | | | | | | | | Some e-mail templates contain text unrelated with the subject of the e-mail PHPBB3-11471
* | [ticket/11103] Newlines at end of filesNathan Guse2012-12-0812-12/+12
| | | | | | | | PHPBB3-11103
* | [ticket/11103] Move all email templates to the email/ directory & prep shortNathaniel Guse2012-11-1119-0/+202
| | | | | | | | | | | | Prepare short email templates (to be used in jabber) PHPBB3-11103
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-163-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_posting.php phpBB/language/en/email/forum_notify.txt phpBB/language/en/email/newtopic_notify.txt phpBB/language/en/email/topic_notify.txt
| * \ Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-163-3/+3
| |\ \ | | |/ | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications
| | * [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-153-3/+3
| | | | | | | | | | | | PHPBB3-8743
* | | [ticket/11103] Fix comma usageNathan Guse2012-10-148-8/+8
| | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084 PHPBB3-11103
* | | [ticket/11103] Fix some language stringsNathan Guse2012-10-146-7/+7
| | | | | | | | | | | | | | | | | | Newlines at end of email files PHPBB3-11103
* | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-0/+14
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-0/+17
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Bug fixNathan Guse2012-09-161-1/+1
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Topic/Post in queue notificationNathan Guse2012-09-153-1/+35
| | | | | | | | | | | | | | | | | | Also, bug fixes and cleanup PHPBB3-11103
* | | [ticket/11103] Use appropriate email templates to send notificationsNathan Guse2012-09-143-16/+40
| | | | | | | | | | | | | | | | | | Fixing a number of bugs PHPBB3-11103
* | | [ticket/11103] General notification email template.Nathan Guse2012-09-091-0/+16
|/ / | | | | | | PHPBB3-11103
* | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-1511-15/+15
|/ | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-131-1/+1
|\ | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| * [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1
| | | | | | | | PHPBB3-8616
* | [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txtAndreas Fischer2011-10-291-1/+1
|/ | | | | | | It does not make much sense to say "the username you received in a previous e-mail" when the message itself contains the username. PHPBB3-10166
* Missed one half of bug #54855 whoopsChris Smith2010-03-021-1/+1
|
* #54855Chris Smith2009-12-111-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10321 89ea8834-ac86-4346-8a33-228a782c2dd0
* now we will have an RC4 we can adjust this one email file to act like all ↵Meik Sievertsen2009-10-281-1/+3
| | | | | | other email files git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10242 89ea8834-ac86-4346-8a33-228a782c2dd0
* it is not a post but a private messageMeik Sievertsen2009-10-041-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10203 89ea8834-ac86-4346-8a33-228a782c2dd0
* More language changesYuriy Rusko2009-08-0611-22/+22
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9933 89ea8834-ac86-4346-8a33-228a782c2dd0
* Users can report PMs to moderators which are then visible in a new MCP moduleNils Adermann2009-07-212-0/+16
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
* - Remove user's password from email templates.Marek A. R2009-07-185-5/+0
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9782 89ea8834-ac86-4346-8a33-228a782c2dd0
* #41845Henry Sudhof2009-02-191-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9332 89ea8834-ac86-4346-8a33-228a782c2dd0
* Changes to group display #32155, #32145, #32085, #26675, #26265Henry Sudhof2008-08-141-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8755 89ea8834-ac86-4346-8a33-228a782c2dd0
* some fixes. :PMeik Sievertsen2007-09-187-9/+15
| | | | | | | - language authors may review their email template files... git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
* - some language tweaks suggested by JohnMeik Sievertsen2007-09-132-2/+2
| | | | | | | | - some bug fixes - finally adding db_tools... git-svn-id: file:///svn/phpbb/trunk@8088 89ea8834-ac86-4346-8a33-228a782c2dd0
* stylistic fixes...Meik Sievertsen2007-08-311-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@8074 89ea8834-ac86-4346-8a33-228a782c2dd0
* Some changes... non-invasive...Meik Sievertsen2007-08-132-0/+9
| | | | git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
* Some fixes...Meik Sievertsen2007-05-242-2/+2
| | | | | | | @translators: please note the split of SEND_EMAIL ;) git-svn-id: file:///svn/phpbb/trunk@7672 89ea8834-ac86-4346-8a33-228a782c2dd0
* label changes, language fixes...Meik Sievertsen2007-05-161-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7608 89ea8834-ac86-4346-8a33-228a782c2dd0
* punctuation changes in language filesMeik Sievertsen2007-05-101-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
* some language-specific adjustementsMeik Sievertsen2007-05-0312-17/+17
| | | | | | | | 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
* do not substract one year, only show the full date to not confuse users.Meik Sievertsen2007-04-241-1/+1
| | | | git-svn-id: file:///svn/phpbb/trunk@7396 89ea8834-ac86-4346-8a33-228a782c2dd0
* #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, ↵Meik Sievertsen2007-04-221-0/+19
| | | | | | | | | | | | | | | | | | #9831, #9830, #9815, #9665, #9624 prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
* fixing some bugs, most being submitted grammatical/spelling errors.Meik Sievertsen2007-01-215-5/+5
| | | | git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
* - fixing some bugsMeik Sievertsen2007-01-2030-53/+53
| | | | | | | | - removing utf8 characters from email files (has been discussed internally, you guys know why) - making sure some opendir calls are checked before calling readdir. git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0
* - telling the admin for what the board contact and board email addresses are ↵Meik Sievertsen2006-12-313-3/+3
| | | | | | | | | used for and also making sure this explanation is correct ;) - fixes for bugs #6694, #6664 and #6662 git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
* #6666 - Diablo-Bertiezilla shall be vanquished!Jonathan Stanley2006-12-291-2/+2
| | | | git-svn-id: file:///svn/phpbb/trunk@6825 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-03 18:50:30 +0000