You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/13 19:32:36 UTC
svn commit: r507148 - in /incubator/roller/branches/roller_4.0: CHANGES.txt
merges.txt
Author: snoopdave
Date: Tue Feb 13 10:32:35 2007
New Revision: 507148
URL: http://svn.apache.org/viewvc?view=rev&rev=507148
Log:
Change and merge notes
Modified:
incubator/roller/branches/roller_4.0/CHANGES.txt
incubator/roller/branches/roller_4.0/merges.txt
Modified: incubator/roller/branches/roller_4.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/CHANGES.txt?view=diff&rev=507148&r1=507147&r2=507148
==============================================================================
--- incubator/roller/branches/roller_4.0/CHANGES.txt (original)
+++ incubator/roller/branches/roller_4.0/CHANGES.txt Tue Feb 13 10:32:35 2007
@@ -36,11 +36,12 @@
Bug Fixes
* [ROL-829] - comment munging escaped HTML content
* [ROL-1280] - entry management paging
- * fix to prevent entries published to future from being viewable via permalinks
- * fixed bug allowing user to create multiple pages with the same name
- * fixed bug allowing user to create a 'Weblog' template without setting defaultPageId
- * fix for in-use category deletion and duplicate named category issues
- * fix for anchor creation when non-alpha characters are involved
+ * Fix to prevent entries published to future from being viewable via permalinks
+ * Fixed bug allowing user to create multiple pages with the same name
+ * Fixed bug allowing user to create a 'Weblog' template without setting defaultPageId
+ * Fix for in-use category deletion and duplicate named category issues
+ * Fix for anchor creation when non-alpha characters are involved
+ * Fix to invalidate session after new user registration
* Fix to invalidate session after new user registration
-------------------------------------------------------------------------------
Modified: incubator/roller/branches/roller_4.0/merges.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/merges.txt?view=diff&rev=507148&r1=507147&r2=507148
==============================================================================
--- incubator/roller/branches/roller_4.0/merges.txt (original)
+++ incubator/roller/branches/roller_4.0/merges.txt Tue Feb 13 10:32:35 2007
@@ -1,5 +1,16 @@
-Merges from trunk into this branch:
+merges.txt
+==========
+
+Temporary file to track merges from trunk into the roller_4.0 branch.
+
+
+Feb. 13, 2007: merging Allen's new planet work
+svn merge -r 504164:506460 https://svn.apache.org/repos/asf/incubator/roller/trunk
Feb. 6, 2007: merging in LDAP/SSO related changes
svn merge -r 504197:504198 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
+Feb. 6, 2007: roller_4.0 branch created
+rev 504164
+