mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-24 21:26:24 +02:00
Code Issues Releases Wiki Activity
29,495 Commits 10 Branches 193 Tags
13d0549e598e0ed3eac6e462464fbd7588da8773
Commit Graph

91 Commits

Author SHA1 Message Date
Marc Alexander
219977ccf3 Merge branch '3.1.x' into 3.2.x 2016-06-19 22:07:42 +02:00
rxu
773a701d62 [ticket/14683] Fix typos in email templates. 
PHPBB3-14683
 2016-06-20 00:15:37 +07:00
Zoddo
57cb7e4111 [ticket/10165] Add a "Send test email" feature 
PHPBB3-10165
 2015-09-09 17:51:14 +02:00
n-aleha
e1eac80b8f [ticket/13586] Allow '0' as username with Jabber notifications 
PHPBB3-13586
 2015-02-07 19:33:19 +02:00
Nils Adermann
6c287e57fc [ticket/10073] Add Admin contact email template 
PHPBB3-10073
 2014-05-29 02:14:29 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates 
PHPBB3-12456
 2014-04-29 15:43:55 +02:00
Joas Schilling
46994e8dfb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11814] Remove redundant text from the topic reply email notification.
 2013-11-19 15:28:37 +01:00
Cesar G
f833a42e7e [ticket/11814] Remove redundant text from the topic reply email notification. 
PHPBB3-11814
 2013-11-19 06:20:37 -08:00
David King
f22b959257 Merge pull request #1620 from EXreaction/ticket/11745 
Group join approved notification
 2013-09-12 21:25:00 -07:00
Andreas Fischer
5ddb0ba629 Merge branch 'develop-olympus' into develop 
* 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
 2013-09-02 12:31:27 +02:00
Andreas Fischer
68555d2d51 Merge branch 'prep-release-3.0.12' into develop-olympus 
* 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
 2013-09-02 12:30:10 +02:00
Andreas Fischer
48825975d1 [ticket/11821] Fix comma usage next to "You are receiving this notification". 
This is a partial backport of 31502cdd6c.

PHPBB3-11821
 2013-09-02 11:41:31 +02:00
Joas Schilling
2ce83fce1e [ticket/11769] Allow '0' as username in notification mails 
PHPBB3-11769
 2013-08-23 23:53:33 +02:00
Joas Schilling
af0f5128c6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
 2013-07-30 01:47:02 +02:00
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt 
PHPBB3-11752
 2013-07-30 01:06:10 +02:00
Nathan Guse
46b4a405b1 [ticket/11745] Group request approved notification 
PHPBB3-11745
 2013-07-27 17:02:45 -05:00
Gaëtan Muller
1f6f2435d0 [ticket/11471] Unrelated text in e-mail templates 
Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471
 2013-04-24 20:07:05 +02:00
Nathan Guse
b91ba8d5f1 [ticket/11103] Newlines at end of files 
PHPBB3-11103
 2012-12-08 13:20:14 -06:00
Nathaniel Guse
985d234a29 [ticket/11103] Move all email templates to the email/ directory & prep short 
Prepare short email templates (to be used in jabber)

PHPBB3-11103
 2012-11-11 11:37:14 -06:00
Nathan Guse
4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
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
 2012-10-16 23:33:57 -05:00
Oleg Pudeyev
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:21:03 -04:00
Nathan Guse
31502cdd6c [ticket/11103] Fix comma usage 
https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084

PHPBB3-11103
 2012-10-14 12:45:04 -05:00
Nathan Guse
716635c834 [ticket/11103] Fix some language strings 
Newlines at end of email files

PHPBB3-11103
 2012-10-14 10:58:23 -05:00
Nathan Guse
6d53bd4675 [ticket/11103] Finishing up PM Report notifications 
PHPBB3-11103
 2012-10-09 22:28:41 -05:00
Nathan Guse
b33e527394 [ticket/11103] Working on report notifications (post/pm) 
PHPBB3-11103
 2012-10-09 22:02:49 -05:00
Nathan Guse
661dd09d6f [ticket/11103] Bug fix 
PHPBB3-11103
 2012-09-16 23:03:00 -05:00
Nathan Guse
7454d5c2d5 [ticket/11103] Topic/Post in queue notification 
Also, bug fixes and cleanup

PHPBB3-11103
 2012-09-15 14:33:15 -05:00
Nathan Guse
959c81d00e [ticket/11103] Use appropriate email templates to send notifications 
Fixing a number of bugs

PHPBB3-11103
 2012-09-14 18:05:13 -05:00
Nathan Guse
ff45c9aa7c [ticket/11103] General notification email template. 
PHPBB3-11103
 2012-09-09 10:36:22 -05:00
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email" 
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
 2012-04-15 20:10:51 +02:00
Joas Schilling
9915ed5255 [ticket/8743] Include poster´s name in mail notifications 
PHPBB3-8743
 2012-03-15 16:07:14 +01:00
Andreas Fischer
0a5d2a84d1 Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus 
* 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
 2011-11-13 20:34:39 +01:00
Andreas Fischer
2e9e0a7d78 [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt 
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
 2011-10-29 00:32:38 +02:00
Igor Wiedler
39f6d58315 [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE 
PHPBB3-8616
 2011-10-13 19:28:46 +02:00
Chris Smith
2f6c8a0164 Missed one half of bug #54855 whoops 2010-03-02 19:30:37 +00:00
Chris Smith
c9b343b2c8 #54855 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10321 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-11 21:23:36 +00:00
Meik Sievertsen
401ee9ce59 now we will have an RC4 we can adjust this one email file to act like all other email files 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10242 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-28 16:18:02 +00:00
Meik Sievertsen
a53c9abf7e it is not a post but a private message 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10203 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-04 10:35:20 +00:00
Yuriy Rusko
380b11fe22 More language changes 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9933 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-06 09:12:21 +00:00
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-21 20:59:11 +00:00
Marek A. R
2d75b39626 - Remove user's password from email templates. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9782 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-18 20:45:36 +00:00
Henry Sudhof
a20c84497c #41845 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9332 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-19 15:07:57 +00:00
Henry Sudhof
bbf42daf34 Changes to group display #32155, #32145, #32085, #26675, #26265 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8755 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-14 12:36:06 +00:00
Meik Sievertsen
951f793dae some fixes. :P 
- language authors may review their email template files...


git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-18 14:49:19 +00:00
Meik Sievertsen
685282c2cb - some language tweaks suggested by John 
- some bug fixes
- finally adding db_tools...


git-svn-id: file:///svn/phpbb/trunk@8088 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-13 15:01:15 +00:00
Meik Sievertsen
83c83e0e6c stylistic fixes... 
git-svn-id: file:///svn/phpbb/trunk@8074 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-31 14:31:25 +00:00
Meik Sievertsen
e9188d4e05 Some changes... non-invasive... 
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-13 12:14:07 +00:00
Meik Sievertsen
60000cec97 Some fixes... 
@translators: please note the split of SEND_EMAIL ;)


git-svn-id: file:///svn/phpbb/trunk@7672 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-24 16:18:04 +00:00
Meik Sievertsen
38e08367d2 label changes, language fixes... 
git-svn-id: file:///svn/phpbb/trunk@7608 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-16 14:45:13 +00:00
Meik Sievertsen
c1a738ce5f punctuation changes in language files 
git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-10 15:31:35 +00:00