ISPConfig3 devel
parent: a6e530 | patch | commitdiff
Marius Burkard
2016-02-06 bc3a7750c366d22ac69561d645312b794b312b84
refs
author Marius Burkard <m.burkard@pixcept.de>
Saturday, February 6, 2016 03:43 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Saturday, February 6, 2016 03:43 -0500
commitbc3a7750c366d22ac69561d645312b794b312b84
tree 80e9be062850db2d9f33676901f0255d3ed978c8 tree | zip | gz
parent a6e530436a45b2b06e71ad5840b99319c64636fa view | diff
f571ae02d848f2b242ed555b3293f06956733577 view | diff 
Merge branch 'html_welcome_mail' into 'stable-3.1'

Allow HTML based welcome messages

I needed a HTML based welcome message, so I added this to mail_plugin.inc.php 

I hope this is the correct approach.

In addition to /conf-custom/mail/welcome_email_DOMAINNAME.txt and /conf-custom/mail/welcome_email_LANGUAGE.txt one may place a /conf-custom/mail/welcome_email_DOMAINNAME.html or /conf-custom/mail/welcome_email_LANGUAGE.html file to allow HTML based welcome messages.

See merge request !276
2 files added
1 files modified
53 ■■■■■ changed files
LICENSE 25 ●●●●● diff | view | raw | blame | history
README.md 10 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 18 ●●●●● diff | view | raw | blame | history