r642 - in zope-passwordresettool/branches/upstream/current: . skins/PasswordReset

[Fabio Tranchitella]

Author: kobold
Date: 2007-02-09 15:01:23 +0100 (Fri, 09 Feb 2007)
New Revision: 642

Modified:
   zope-passwordresettool/branches/upstream/current/CHANGES.txt
   zope-passwordresettool/branches/upstream/current/skins/PasswordReset/registered_notify_template.pt
   zope-passwordresettool/branches/upstream/current/version.txt
Log:
[svn-upgrade] Integrating new upstream version, zope-passwordresettool (0.4.2)

Modified: zope-passwordresettool/branches/upstream/current/CHANGES.txt
===================================================================
--- zope-passwordresettool/branches/upstream/current/CHANGES.txt	2007-02-09 14:00:27 UTC (rev 641)
+++ zope-passwordresettool/branches/upstream/current/CHANGES.txt	2007-02-09 14:01:23 UTC (rev 642)
@@ -1,3 +1,12 @@
+PasswordResetTool 0.4.2
+
+  - Fixed some minor whitespace issue in registered_notify_template.pt.
+    [hannosch]
+
+  - allow password reset token to be passed in, in cases where we might not
+    have the permission to request a reset from within the template
+    [rafrombrc]
+
 PasswordResetTool 0.4.1
 
   - protect requestRest method of the tool so it can not be called anonymously

Modified: zope-passwordresettool/branches/upstream/current/skins/PasswordReset/registered_notify_template.pt
===================================================================
--- zope-passwordresettool/branches/upstream/current/skins/PasswordReset/registered_notify_template.pt	2007-02-09 14:00:27 UTC (rev 641)
+++ zope-passwordresettool/branches/upstream/current/skins/PasswordReset/registered_notify_template.pt	2007-02-09 14:01:23 UTC (rev 642)
@@ -12,11 +12,11 @@
      tal:omit-tag=""
      tal:define="fullname python: test(member.fullname,
                  ' ' + member.fullname, '')">
-    Welcome<span i18n:name="fullname" tal:replace="fullname" />,
+    Welcome <span i18n:name="fullname" tal:replace="fullname" />,
 
     You have been registered as a member of <span i18n:name="portal_name" tal:omit-tag="" tal:content="python:here.portal_url.getPortalObject().Title()" />, 
     which allows you to personalize your view of the website and participate in
-    the community. Please activate your account by visiting 
+    the community. Please activate your account by visiting
     
     <span i18n:name="set_password" tal:replace="python:here.pwreset_constructURL(reset['randomstring'])+'?userid='+member.getUserName()" />
     

Modified: zope-passwordresettool/branches/upstream/current/version.txt
===================================================================
--- zope-passwordresettool/branches/upstream/current/version.txt	2007-02-09 14:00:27 UTC (rev 641)
+++ zope-passwordresettool/branches/upstream/current/version.txt	2007-02-09 14:01:23 UTC (rev 642)
@@ -1 +1 @@
-0.4.1
+0.4.2