--- mambo/branches/4.6/CHANGELOG.php	2006/03/20 01:01:44	405
+++ mambo/branches/4.6/CHANGELOG.php	2006/04/02 19:44:24	436
@@ -7,7 +7,7 @@
 * Mambo was originally developed by Miro (www.miro.com.au) in 2000. Miro assigned the copyright in Mambo to The Mambo Foundation in 2005 to ensure
 * that Mambo remained free Open Source software owned and managed by the community.
 * Mambo is Free Software
-*/ 
+*/
 
 // no direct access
 defined( '_VALID_MOS' ) or die( 'Direct Access to this location is not allowed.' );
@@ -29,10 +29,57 @@
 ! -> Note
 
 -------------------- 4.6 Release --------------------------
+
+2-April-2006 Chad Auld (cauld)
+! Committed bot_mostlyce V1.5 (major changes in the way of authentication, plugin loading, etc.)  Simplified and much cleaner.
+! Committed com_mostlyce V1.4 (major admin interface changes, some options removed, and some new ones added).
+- Removed MOStlyCE imgmanager, filemanager, & preview plugins.  Also removed auth_mostlyce.php.  Will eventually re-implement in a cleaner and more efficient manner.
+
+1-April-2006 Martin Brampton (counterpoint)
++ Added Mambo Containers admin side component (NOT an April Fool joke :))
+
+31-March-2006 Neil Thompson (neilt)
+! changed admin to show advanced_mode as default
+
+30-March-2006 Neil Thompson (neilt)
+# Fixed mod_latest_content no content error
+# Fixed handlers in mod_latest_content
+# Corrected cases in mod_latest_content
+! Removed mod_latest_content fixed width limit in horizontal td case
+# Fixed bug in content.class.php getBlogSectionCount() not returning 0 count
+! Module mod_latest_content changed to default unpublished
+
+28-March-2006 Neil Thompson (neilt)
+# Fixed problem with missing legends in Content Section, Category, Content Item
+
+26-March-2006 Chad Auld (cauld)
+! Mambo's security list email address has changed, updated email address on the installation survey.
+
+22-March-2006 Martin Brampton (counterpoint)
+! Optimised admin module mod_stats to user mosMenuHandler instead of DB
+! Optimised mostlyce.php to call mainframe for template instead of DB
+# Fixed problem with combining update session with validation
+! Reorganised admin side index.php logic so that resubmitting login ignored
+# Fixed offline check issue following changes to check admin session
+! Changed mosMenuHandler getMenuType method to return counts as well as types
+
+21-March-2006 Martin Brampton (counterpoint)
+! Further optimisation in CMT classes, user authenticator
+! Merging of some methods between mosDBTable and mosDBTableEntry
++ Introduction of getNullDate method in database
+! Revised method of discovering document root in index.php
+! Optimised handling of admin user and sessions
+- Removal of checkAdminSession from admin.php - small amounts of
+  new code in mosUser, mosSession and index.php adminside processing
+! Small modifications to the editor to attempt to overcome the
+  environment setup problems by including index.php
+
+20-March-2006 Chad Auld (cauld)
++ Adding a donation icon to the new installation survey
 
 19-March-2006 Chad Auld (cauld)
-! Disabling MOStlyCE's preview plugin.  Mambo has its own preview option so no since in slowing down the editor.
-+ Adding the Print plugin to MOStlyCE. It was there, but was failing to load and display.
+! Disabling MOStlyCE's preview plugin.  Mambo has its own preview option so no since in slowing down the editor.
++ Adding the Print plugin to MOStlyCE. It was there, but was failing to load and display.
 
 19-March-2006 Martin Brampton (counterpoint)
 ! Reinstalled changes to popup code, mainly in menubar.html.php, somehow
@@ -144,7 +191,7 @@
 ! Modified search component.  Used to use stop words from e.g. english.ignore.php
   against the whole search string.  Now individual stop words are removed for
   better searching
-  
+
 26-Jan-2006 Martin Brampton (counterpoint)
 ! Modified pathway logic to suppress if only the single item 'Home'
 ! Various merge and other bugs fixed
@@ -324,7 +371,7 @@
 # Added default of null string to params field in mos_section.
 
 21-Dec-2005 Chad Auld (cauld)
-! Updating default templates with some minor fixes 
+! Updating default templates with some minor fixes
 # Fixing some formatting errors on the sample data
 
 21-Dec-2005 Carlos Souza (csouza)
@@ -366,7 +413,7 @@
 ! Fixed GPL text in install (made all 1 font, easier to read)
 - Removed old templates
 + Added new Mambo default template
-! Changed more sample data 
+! Changed more sample data
 ! Updated the default setup to fit new template
 ! Adding setting to default register globals emulation to "On"
 
@@ -398,7 +445,7 @@
   /administrator/components/com_menus/content_section/content_section.menu.html.php
 
 13-Nov-2005 Chad Auld (cauld)
-! Updated install screens to display 453 and release dates.  
+! Updated install screens to display 453 and release dates.
 ! Changed the newsflash articles included with the sample data.
 # [#8199] Database queries in gacl_api.class
 # [#7713] mosMail fix bcc bug + add missing ReplyTo fields
@@ -425,7 +472,7 @@
  !  Changed date format "Y-m-d h:i:s" to "Y-m-d H:i:s" in message send in frontend
 
 20-Oct-2005 Chad Auld (cauld)
- !  Fixed SQL injection hole in content submission 
+ !  Fixed SQL injection hole in content submission
 
 20-Oct-2005 Cameron Fraser
 + Added Simple / Advanced functionality to Add / Edit (Content/Section/Category) pages
@@ -435,7 +482,7 @@
 	admin.categories.html.php
 	admin.typedcontent.html.php
 	index2.php
-		 
+
 19-Oct-2005 Chad Auld (cauld)
  # [#8260] Search highlighting fails when a "?" is entered