Commit graph

24 commits

Author SHA1 Message Date
rxu
773a701d62 [ticket/14683] Fix typos in email templates.
PHPBB3-14683
2016-06-20 00:15:37 +07: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
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
Nathan Guse
b91ba8d5f1 [ticket/11103] Newlines at end of files
PHPBB3-11103
2012-12-08 13:20: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
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
Joas Schilling
9915ed5255 [ticket/8743] Include poster´s name in mail notifications
PHPBB3-8743
2012-03-15 16:07:14 +01: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
9f9322511d do not substract one year, only show the full date to not confuse users.
git-svn-id: file:///svn/phpbb/trunk@7396 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-24 17:19:01 +00:00
Meik Sievertsen
31e546c5e4 - fixing some bugs
- 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
2007-01-20 17:58:27 +00:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Jonathan Stanley
979e36077f #5294 - Typographic heaven... curly quotes, em dashes and proper apostrophes. :)
git-svn-id: file:///svn/phpbb/trunk@6583 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-14 17:53:00 +00:00
Jonathan Stanley
ac19d4b24c #5112
git-svn-id: file:///svn/phpbb/trunk@6566 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-11 17:13:34 +00:00
Jonathan Stanley
59d78ec21b #4880
#4882
#4884
#4898
#4910
#4926
#4928
#4930
#4934
#4936
#4938
#4942
#4944
#4946
#4948
#4950
#4952
#4954
#4956
#4960
#4972
#4980


git-svn-id: file:///svn/phpbb/trunk@6535 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-10-28 21:17:42 +00:00
Nils Adermann
ea065f3e67 - no more encoding mixture, say hello to UTF-8 (I'll add a validation 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
2006-09-17 22:02:28 +00:00
Meik Sievertsen
c3717d3808 - fix notify templates
- re-added subscribe/unsubscribe topic links. ;)


git-svn-id: file:///svn/phpbb/trunk@4905 89ea8834-ac86-4346-8a33-228a782c2dd0
2004-05-31 21:35:43 +00:00
Meik Sievertsen
d585b01f78 new link to topic. (sometimes the post link is invalid [post deleted], this is the easiest method to prevent users screaming about non-existing topics)
git-svn-id: file:///svn/phpbb/trunk@4547 89ea8834-ac86-4346-8a33-228a782c2dd0
2003-10-10 15:07:10 +00:00
Paul S. Owen
1cb3f21004 Removed {USERNAME}
git-svn-id: file:///svn/phpbb/trunk@3904 89ea8834-ac86-4346-8a33-228a782c2dd0
2003-04-21 14:17:22 +00:00
Paul S. Owen
9ea1bc91e9 ISO
git-svn-id: file:///svn/phpbb/trunk@2920 89ea8834-ac86-4346-8a33-228a782c2dd0
2002-10-04 12:40:07 +00:00