[CMF-checkins] SVN: CMF/trunk/ - removed some CHANGES.txt entries that don't belong on the trunk

[Jens Vagelpohl]

Log message for revision 41668:
  - removed some CHANGES.txt entries that don't belong on the trunk
  - re-synched HISTORY.txt with the 1.6 and 1.5 branch information
  

Changed:
  U   CMF/trunk/CHANGES.txt
  U   CMF/trunk/HISTORY.txt

-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt	2006-02-18 14:51:44 UTC (rev 41667)
+++ CMF/trunk/CHANGES.txt	2006-02-18 14:52:59 UTC (rev 41668)
@@ -123,10 +123,6 @@
 
   Bug Fixes
 
-    - CMFCore.FSPythonScript: FSPythonScripts forgot to add __file__ to
-      the script globals. This broke warnings.warn() when a stacklevel
-      argument pointing into the script was passed (2).
-
     - CMFDefault setuphandlers: Disabled password encryption.
       'registeredNotify' and 'mailPassword' don't work with encrypted
       passwords.

Modified: CMF/trunk/HISTORY.txt
===================================================================
--- CMF/trunk/HISTORY.txt	2006-02-18 14:51:44 UTC (rev 41667)
+++ CMF/trunk/HISTORY.txt	2006-02-18 14:52:59 UTC (rev 41668)
@@ -2,10 +2,6 @@
 
   Bug Fixes
 
-    - DCWorkflow.exportimport: Workflows managing no permissions at all
-      could make the DCWorkflow workflow exporter fail.
-      (http://www.zope.org/Collectors/CMF/397)
-
     - Removed BBBTransaction class from CMFCore.utils
 
     - Extension profiles: Fixed import of actions, now they don't
@@ -14,6 +10,10 @@
 
   Features
 
+    - CMFCore.FSDTMLMethod/FSImage/FSFile: Added 304 Not Modified support
+      analogous to the support added for FSPageTemplates earlier on.
+      (http://www.zope.org/Collectors/CMF/402)
+
     - Replaced Z2 interfaces w/ Z3 interfaces, dynamically creating Z2
       interfaces via bridge
 
@@ -33,8 +33,6 @@
 
     - Reordered base classes of File and Image, to allow use of super().
 
-    - Made unit tests close the request properly.
-
     - Changed TypesTool.manage_addTypeInformation method to log a warning
       instead of raise an exception if the typeinfo_name is not found.           
 
@@ -43,6 +41,14 @@
 
   Bug Fixes
 
+    - CMFDefault.RegistrationTool: Adding single quotes to the allowed
+      characters in the local part of an email address.
+      (http://www.zope.org/Collectors/CMF/401)
+
+    - CMFCore.FSPythonScript: FSPythonScripts forgot to add __file__ to
+      the script globals. This broke warnings.warn() when a stacklevel
+      argument pointing into the script was passed (2).
+
     - CMFSetup.workflow: Workflows managing no permissions at all could
       make the CMFSetup workflow exporter fail.
       (http://www.zope.org/Collectors/CMF/397)