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 /inc/lang | |
| 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 'inc/lang')
| -rw-r--r-- | inc/lang/en/mailwrap.html | 13 | ||||
| -rw-r--r-- | inc/lang/en/subscr_digest.txt | 2 | ||||
| -rw-r--r-- | inc/lang/en/subscr_list.txt | 2 | ||||
| -rw-r--r-- | inc/lang/en/subscr_single.txt | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html new file mode 100644 index 000000000..f9f80fd80 --- /dev/null +++ b/inc/lang/en/mailwrap.html @@ -0,0 +1,13 @@ +<html> +<head> + <title>@TITLE@</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> + +@HTMLBODY@ + +<br /><hr /> +<small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small> +</body> +</html> diff --git a/inc/lang/en/subscr_digest.txt b/inc/lang/en/subscr_digest.txt index fac8564bd..35011b6e6 100644 --- a/inc/lang/en/subscr_digest.txt +++ b/inc/lang/en/subscr_digest.txt @@ -15,6 +15,6 @@ To cancel the page notifications, log into the wiki at @SUBSCRIBE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ diff --git a/inc/lang/en/subscr_list.txt b/inc/lang/en/subscr_list.txt index efe27d866..4c38b9326 100644 --- a/inc/lang/en/subscr_list.txt +++ b/inc/lang/en/subscr_list.txt @@ -12,6 +12,6 @@ To cancel the page notifications, log into the wiki at @SUBSCRIBE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt index f2abe6d77..673c4c32a 100644 --- a/inc/lang/en/subscr_single.txt +++ b/inc/lang/en/subscr_single.txt @@ -18,6 +18,6 @@ To cancel the page notifications, log into the wiki at @NEWPAGE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ |