diff options
| -rw-r--r-- | ACKNOWLEDGMENTS | 1 | ||||
| -rw-r--r-- | Mailman/Cgi/admin.py | 8 | ||||
| -rw-r--r-- | Mailman/Cgi/edithtml.py | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | admin/www/inthenews.ht | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS index e787b23f..60c9c3fd 100644 --- a/ACKNOWLEDGMENTS +++ b/ACKNOWLEDGMENTS @@ -57,6 +57,7 @@ in answering questions on mailman-users. David Blomquist Bojan Søren Bondrup + Grant Bowman Alessio Bragadini J. D. Bronson Stan Bubrouski diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index cbe0a410..31e41a3d 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2004 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 @@ -14,9 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -"""Process and produce the list-administration options forms. - -""" +"""Process and produce the list-administration options forms.""" # For Python 2.1.x compatibility from __future__ import nested_scopes @@ -413,7 +411,7 @@ def show_results(mlist, doc, category, subcat, cgidata): otherlinks.AddItem(Link(mlist.GetScriptURL('listinfo'), _('Go to the general list information page'))) otherlinks.AddItem(Link(mlist.GetScriptURL('edithtml'), - _('Edit the public HTML pages'))) + _('Edit the public HTML pages and text files'))) otherlinks.AddItem(Link(mlist.GetBaseArchiveURL(), _('Go to list archives')).Format() + '<br> <br>') diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py index cd235162..493763b4 100644 --- a/Mailman/Cgi/edithtml.py +++ b/Mailman/Cgi/edithtml.py @@ -1,17 +1,17 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2004 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 # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """Script which implements admin editing of the list's html templates.""" @@ -43,6 +43,7 @@ def main(): ('listinfo.html', _('General list information page')), ('subscribe.html', _('Subscribe results page')), ('options.html', _('User specific options page')), + ('subscribeack.txt', _('Welcome email text file')), ) _ = i18n._ @@ -6,6 +6,8 @@ Here is a history of user visible changes to Mailman. 2.1.6 (XX-XXX-200X) + - Allow editing of the welcome message from the admin page (1085501). + - A potential cross-site scripting hole in the driver script has been closed. Thanks to Florian Weimer for its discovery. Also, turn STEALTH_MODE on by default. diff --git a/admin/www/inthenews.ht b/admin/www/inthenews.ht index 40a8f9e8..58ad1db7 100644 --- a/admin/www/inthenews.ht +++ b/admin/www/inthenews.ht @@ -569,4 +569,8 @@ Mailman or Mailman technology to run their mailing lists. Comics)</a> <!-- Ziya Karakaya --> <li><a href="http://www.atilim.edu.tr">Atilim University</a> + <!-- Massimiliano Ferrero --> + <li><a href="http://www.midhgard.it">Midhgard srl</a> + <!-- Clifford Helsel --> + <li><a href="http://www.thesolutioncafe.com">The Solution Cafe, Inc.</a> </ul> |