diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-20 21:44:48 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-20 21:44:48 +0200 |
| commit | 73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a (patch) | |
| tree | 6f051c557dd65b39b71a77e47dca695d31c9c4df /conf | |
| parent | f64856ce8e8057c67c211aadd41ff22ec10f2bb0 (diff) | |
| parent | 8a803cae76e430dc0f358986db3420ef45049370 (diff) | |
| download | rpg-73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a.tar.gz rpg-73d2d14ce0b465ec7117c8dc6ab39a59f6ed7b5a.tar.bz2 | |
Merge branch 'master' into phpunit
* master: (29 commits)
some edge case checking in search result highlighting
Resolve empty page ID to configured start page
Added more detail error code for unauthorized calls in xmlrpc interface.
changed internal Mailer members from private to protected
made it possible to disable HTML mails in the config
removed commented code left from the quoted_printable days
add missing table tags for HTML diff mails
fixed subscriber mail signatures
use real HRs in HTML mails
Add various headers to the mails FS#2247. pull request #83 closed
removed footer image from HTML mails
use inlinestyles for diffs in HTML mails
fixed signature stripping
fixed mailprefix handling
fixed missing replacement for HTML notify mails
allow image embeds in HTML mail templates
Added HTML wrapper for mails
allow non-txt extensions when accessing locales
added Mailer class to autoloader
Replaced mail_send calls with new Mailer class
...
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dokuwiki.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 4ca29b461..35f946b10 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -110,6 +110,7 @@ $conf['notify'] = ''; //send change info to this email (leave $conf['registernotify'] = ''; //send info about newly registered users to this email (leave blank for nobody) $conf['mailfrom'] = ''; //use this email when sending mails $conf['mailprefix'] = ''; //use this as prefix of outgoing mails +$conf['htmlmail'] = 1; //send HTML multipart mails /* Syndication Settings */ $conf['sitemap'] = 0; //Create a google sitemap? How often? In days. |