------------------------------------------------------------
revno: 1018
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.2
timestamp: Fri 2008-12-05 15:27:40 -0800
message:
Merged changes from the 2.1 branch.
modified:
FAQ
Mailman/Cgi/edithtml.py
Mailman/Utils.py
NEWS
------------------------------------------------------------
revno: 984.1.162
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2008-12-05 15:23:43 -0800
message:
Updated some FAQ URLs for wiki.list.org.
modified:
FAQ
Mailman/Cgi/edithtml.py
NEWS
------------------------------------------------------------
revno: 984.1.161
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2008-12-05 15:08:41 -0800
message:
Changed the regexp for Utils.suspiciousHTML to exempt the
<link rel="SHORTCUT ICON" href="<mm-favicon>">
tag in the options.html template.
modified:
Mailman/Utils.py
=== modified file 'FAQ'
--- a/FAQ 2008-06-06 18:13:09 +0000
+++ b/FAQ 2008-12-05 23:23:43 +0000
@@ -2,9 +2,8 @@
Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-Note: We're migrating the FAQ to an on-line interactive system called
- "FAQ Wizard". To see the Mailman FAQ Wizard in action, go to
- http://www.python.org/cgi-bin/faqw-mm.py
+Note: We've migrated the FAQ to the wiki at http://wiki.list.org/
+ To see the Mailman FAQ go to http://wiki.list.org/x/AgA3
FREQUENTLY ASKED QUESTIONS
@@ -188,8 +187,7 @@
Q. I want to backup my lists. What do I need to save?
-A. See this FAQ wizard entry:
- http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq04.006.htp
+A. See this FAQ entry: http://wiki.list.org/x/5oA9
Q. How do I rename a list?
=== modified file 'Mailman/Cgi/edithtml.py'
--- a/Mailman/Cgi/edithtml.py 2007-12-04 19:52:18 +0000
+++ b/Mailman/Cgi/edithtml.py 2008-12-05 23:23:43 +0000
@@ -168,7 +168,7 @@
""")))
doc.AddItem(_('See '))
doc.AddItem(Link(
-'http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq04.048.htp',
+'http://wiki.list.org/x/jYA9',
_('FAQ 4.48.')))
doc.AddItem(Header(3,_("Page Unchanged.")))
doc.AddItem('<hr>')
=== modified file 'Mailman/Utils.py'
--- a/Mailman/Utils.py 2008-12-03 01:11:33 +0000
+++ b/Mailman/Utils.py 2008-12-05 23:27:40 +0000
@@ -961,7 +961,8 @@
# Many thanks are due to Moritz Naumann for his assistance with this.
_badwords = [
'<i?frame',
- '<link',
+ # Kludge to allow the specific tag that's in the options.html template.
+ '<link(?! rel="SHORTCUT ICON" href="<mm-favicon>">)',
'<meta',
'<script',
r'(?:^|\W)j(?:ava)?script(?:\W|$)',
=== modified file 'NEWS'
--- a/NEWS 2008-12-03 01:11:33 +0000
+++ b/NEWS 2008-12-05 23:27:40 +0000
@@ -84,6 +84,9 @@
- Fixed a minor issue in cron/gate_news that could cause a list's
watermark to not be completely updated.
+ - Fixed an issue that prevented editing the options.html template from
+ the web admin interface. SF Bug #2164798.
+
2.1.11 (30-Jun-2008)
New Features
--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
