aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-05-19 15:03:24 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-05-19 15:03:24 +0900
commit7c30553ab40d794160b7329b2fe8a85aafb0f595 (patch)
tree44c44b44289902102172b207812df5dac73f4023
parent658947a718531f1bc3f405e7d7611a16bfb9071b (diff)
parent78582187ce1ba47cddf8ca5b03d515e1355c861f (diff)
downloadmailman2-7c30553ab40d794160b7329b2fe8a85aafb0f595.tar.gz
mailman2-7c30553ab40d794160b7329b2fe8a85aafb0f595.tar.xz
mailman2-7c30553ab40d794160b7329b2fe8a85aafb0f595.zip
Merge lp:mailman/2.1 rev 1653
Diffstat (limited to '')
-rw-r--r--Mailman/Cgi/edithtml.py14
-rw-r--r--NEWS5
2 files changed, 17 insertions, 2 deletions
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
index d01ff889..85632531 100644
--- a/Mailman/Cgi/edithtml.py
+++ b/Mailman/Cgi/edithtml.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -47,6 +47,18 @@ def main():
('options.html', _('User specific options page')),
('subscribeack.txt', _('Welcome email text file')),
('masthead.txt', _('Digest masthead')),
+ ('postheld.txt', _('User notice of held post')),
+ ('approve.txt', _('User notice of held subscription')),
+ ('refuse.txt', _('Notice of post refused by moderator')),
+ ('invite.txt', _('Invitation to join list')),
+ ('verify.txt', _('Request to confirm subscription')),
+ ('unsub.txt', _('Request to confirm unsubscription')),
+ ('nomoretoday.txt', _('User notice of autoresponse limit')),
+ ('postack.txt', _('User post acknowledgement')),
+ ('disabled.txt', _('Subscription disabled by bounce warning')),
+ ('admlogin.html', _('Admin/moderator login page')),
+ ('private.html', _('Private archive login page')),
+ ('userpass.txt', _('On demand password reminder')),
)
_ = i18n._
diff --git a/NEWS b/NEWS
index aa35687e..d56927df 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,13 @@ Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
-2.1.2 (xx-xxx-xxxx)
+2.1.23 (xx-xxx-xxxx)
New Features
+ - Several additional templates have been added to those that can be edited
+ via the web admin GUI. (LP: #1583387)
+
- SMTPDirect.py can now do SASL authentication and STARTTLS security when
connecting to the outgoiung MTA. Associated with this are new
Defaults.py/mm_cfg.py settings SMTP_AUTH, SMTP_USER, SMTP_PASSWD and