Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/11327] Adjust wording of forgot password email | Marc Alexander | 2019-08-09 | 1 | -9/+5 |
| | | | | PHPBB3-11327 | ||||
* | [ticket/11327] Rename email file to forgot password | Marc Alexander | 2019-08-09 | 1 | -0/+0 |
| | | | | PHPBB3-11327 | ||||
* | [ticket/15967] Improve admin activate email wording | Jakub Senko | 2019-06-04 | 1 | -1/+1 |
| | | | | PHPBB3-15967 | ||||
* | [ticket/15931] Fix PM report emails | mrgoldy | 2019-01-14 | 1 | -1/+1 |
| | | | | PHPBB3-15931 | ||||
* | [ticket/14656] Add List-Unsubscribe header to emails | Oliver Schramm | 2018-09-16 | 3 | -0/+3 |
| | | | | PHPBB3-14656 | ||||
* | [ticket/15628] Add topic link to newtopic_notify.txt | Jakub Senko | 2018-06-19 | 1 | -0/+4 |
| | | | | PHPBB3-15628 | ||||
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-06-19 | 5 | -5/+5 |
|\ | |||||
| * | [ticket/14683] Fix typos in email templates. | rxu | 2016-06-20 | 5 | -5/+5 |
| | | | | | | | | PHPBB3-14683 | ||||
* | | [ticket/10165] Add a "Send test email" feature | Zoddo | 2015-09-09 | 1 | -0/+9 |
|/ | | | | PHPBB3-10165 | ||||
* | [ticket/13586] Allow '0' as username with Jabber notifications | n-aleha | 2015-02-07 | 2 | -2/+2 |
| | | | | PHPBB3-13586 | ||||
* | [ticket/10073] Add Admin contact email template | Nils Adermann | 2014-05-29 | 1 | -0/+23 |
| | | | | PHPBB3-10073 | ||||
* | [ticket/12456] Fix missing new lines at the end of email templates | Joas Schilling | 2014-04-29 | 18 | -21/+17 |
| | | | | PHPBB3-12456 | ||||
* | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-11-19 | 1 | -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 G | 2013-11-19 | 1 | -2/+1 |
| | | | | | | | | PHPBB3-11814 | ||||
* | | Merge pull request #1620 from EXreaction/ticket/11745 | David King | 2013-09-12 | 1 | -10/+0 |
|\ \ | | | | | | | Group join approved notification | ||||
| * | | [ticket/11745] Group request approved notification | Nathan Guse | 2013-07-27 | 1 | -10/+0 |
| | | | | | | | | | | | | PHPBB3-11745 | ||||
* | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 3 | -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-olympus | Andreas Fischer | 2013-09-02 | 3 | -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 mails | Joas Schilling | 2013-08-23 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-11769 | ||||
| * | | | [ticket/11821] Fix comma usage next to "You are receiving this notification". | Andreas Fischer | 2013-09-02 | 3 | -3/+3 |
| |/ / | | | | | | | | | | | | | | | | This is a partial backport of 31502cdd6c3a5bac5164ec30530e5b4bf63f3196. PHPBB3-11821 | ||||
* | | | Merge branch 'develop-olympus' into develop | Joas Schilling | 2013-07-30 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | * develop-olympus: [ticket/11752] HTTP -> HTTPs in email/installed.txt | ||||
| * | [ticket/11752] HTTP -> HTTPs in email/installed.txt | Andreas Fischer | 2013-07-30 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11752 | ||||
* | | [ticket/11471] Unrelated text in e-mail templates | Gaëtan Muller | 2013-04-24 | 20 | -54/+10 |
| | | | | | | | | | | | | | | Some e-mail templates contain text unrelated with the subject of the e-mail PHPBB3-11471 | ||||
* | | [ticket/11103] Newlines at end of files | Nathan Guse | 2012-12-08 | 12 | -12/+12 |
| | | | | | | | | PHPBB3-11103 | ||||
* | | [ticket/11103] Move all email templates to the email/ directory & prep short | Nathaniel Guse | 2012-11-11 | 19 | -0/+202 |
| | | | | | | | | | | | | Prepare short email templates (to be used in jabber) PHPBB3-11103 | ||||
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 | Nathan Guse | 2012-10-16 | 3 | -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 develop | Oleg Pudeyev | 2012-10-16 | 3 | -3/+3 |
| |\ \ | | |/ | | | | | | | | | | * develop-olympus: [ticket/8743] Include poster´s name in mail notifications | ||||
| | * | [ticket/8743] Include poster´s name in mail notifications | Joas Schilling | 2012-03-15 | 3 | -3/+3 |
| | | | | | | | | | | | | PHPBB3-8743 | ||||
* | | | [ticket/11103] Fix comma usage | Nathan Guse | 2012-10-14 | 8 | -8/+8 |
| | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084 PHPBB3-11103 | ||||
* | | | [ticket/11103] Fix some language strings | Nathan Guse | 2012-10-14 | 6 | -7/+7 |
| | | | | | | | | | | | | | | | | | | Newlines at end of email files PHPBB3-11103 | ||||
* | | | [ticket/11103] Finishing up PM Report notifications | Nathan Guse | 2012-10-09 | 1 | -0/+14 |
| | | | | | | | | | | | | PHPBB3-11103 | ||||
* | | | [ticket/11103] Working on report notifications (post/pm) | Nathan Guse | 2012-10-09 | 1 | -0/+17 |
| | | | | | | | | | | | | PHPBB3-11103 | ||||
* | | | [ticket/11103] Bug fix | Nathan Guse | 2012-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11103 | ||||
* | | | [ticket/11103] Topic/Post in queue notification | Nathan Guse | 2012-09-15 | 3 | -1/+35 |
| | | | | | | | | | | | | | | | | | | Also, bug fixes and cleanup PHPBB3-11103 | ||||
* | | | [ticket/11103] Use appropriate email templates to send notifications | Nathan Guse | 2012-09-14 | 3 | -16/+40 |
| | | | | | | | | | | | | | | | | | | Fixing a number of bugs PHPBB3-11103 | ||||
* | | | [ticket/11103] General notification email template. | Nathan Guse | 2012-09-09 | 1 | -0/+16 |
|/ / | | | | | | | PHPBB3-11103 | ||||
* | | [ticket/10161] all "e-mail" strings in language files changed to "email" | Senky | 2012-04-15 | 11 | -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-olympus | Andreas Fischer | 2011-11-13 | 1 | -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_MESSAGE | Igor Wiedler | 2011-10-13 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-8616 | ||||
* | | [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt | Andreas Fischer | 2011-10-29 | 1 | -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 whoops | Chris Smith | 2010-03-02 | 1 | -1/+1 |
| | |||||
* | #54855 | Chris Smith | 2009-12-11 | 1 | -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 Sievertsen | 2009-10-28 | 1 | -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 message | Meik Sievertsen | 2009-10-04 | 1 | -1/+1 |
| | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10203 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
* | More language changes | Yuriy Rusko | 2009-08-06 | 11 | -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 module | Nils Adermann | 2009-07-21 | 2 | -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. R | 2009-07-18 | 5 | -5/+0 |
| | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9782 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
* | #41845 | Henry Sudhof | 2009-02-19 | 1 | -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, #26265 | Henry Sudhof | 2008-08-14 | 1 | -1/+1 |
| | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8755 89ea8834-ac86-4346-8a33-228a782c2dd0 | ||||
* | some fixes. :P | Meik Sievertsen | 2007-09-18 | 7 | -9/+15 |
| | | | | | | | - language authors may review their email template files... git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0 |