aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/email
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11327] Adjust wording of forgot password emailMarc Alexander2019-08-091-9/+5
| | | | PHPBB3-11327
* [ticket/11327] Rename email file to forgot passwordMarc Alexander2019-08-091-0/+0
| | | | PHPBB3-11327
* [ticket/15967] Improve admin activate email wordingJakub Senko2019-06-041-1/+1
| | | | PHPBB3-15967
* [ticket/15931] Fix PM report emailsmrgoldy2019-01-141-1/+1
| | | | PHPBB3-15931
* [ticket/14656] Add List-Unsubscribe header to emailsOliver Schramm2018-09-163-0/+3
| | | | PHPBB3-14656
* [ticket/15628] Add topic link to newtopic_notify.txtJakub Senko2018-06-191-0/+4
| | | | PHPBB3-15628
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-195-5/+5
|\
| * [ticket/14683] Fix typos in email templates.rxu2016-06-205-5/+5
| | | | | | | | PHPBB3-14683
* | [ticket/10165] Add a "Send test email" featureZoddo2015-09-091-0/+9
|/ | | | PHPBB3-10165
* [ticket/13586] Allow '0' as username with Jabber notificationsn-aleha2015-02-072-2/+2
| | | | PHPBB3-13586
* [ticket/10073] Add Admin contact email templateNils Adermann2014-05-291-0/+23
| | | | PHPBB3-10073
* [ticket/12456] Fix missing new lines at the end of email templatesJoas Schilling2014-04-2918-21/+17
| | | | PHPBB3-12456
* Merge branch 'develop-olympus' into developJoas Schilling2013-11-191-2/+1
|\ | | | | | | | | * develop-olympus: [ticket/11814] Remove redundant text from the topic reply email notification.
| * [ticket/11814] Remove redundant text from the topic reply email notification.Cesar G2013-11-191-2/+1
| | | | | | | | PHPBB3-11814
* | 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