Updated CHANGELOG and UPGRADING instructions

2 files changed, 24 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9710fa1dc..b48d2ddb8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,17 +1,32 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2006/12/01 (thomasb)
+----------
+- Implemented preview pane
+- Fixed XSS vulnerability (Bug #1484109)
+- Remove newlines from mail headers (Bug #1484031)
+- Selection issues when moving/deleting (Bug #1484044)
+- Applied patch of Clement Moulin for imap host auto-selection
+- ISO-encode IMAP password for plaintext login (Bugs #1483977 & #1483886)
+- Fixed folder name encoding in subscription list (Bug #1484113)
+- Fixed JS errors in identity list (Bug #1484120)
+- Show client debug console on debug_level 8
+
 
 2006/11/22 (robin)
+----------
 - Fix a bug introduced with Shift-Del yesterday
 
 
 2006/11/21 (robin)
+----------
 - Add missing nl_NL translations
 - Translate foldernames in folder form (closes #1484113)
 
 
 2006/11/21 (robin)
+----------
 - Added first and last buttons to message list, address book
   and message detail
 - Pressing Shift-Del bypasses Trash folder
@@ -35,12 +50,18 @@ CHANGELOG RoundCube Webmail
 - fixed deletion/moving of messages from within "show" page
 
 
+2006/11/09 (thomasb)
+----------
+- Little bugfix in HTML encoding
+- Fixed encoding issues and delete-on-reply problem
+- Corrected template parsing
+
+
 2006/11/07 (estadtherr)
 ----------
 - Upgraded to TinyMCE v2.0.8
 - Fixed CSS path for editor popups
 
-
 2006/09/26 (estadtherr)
 ----------
 - Added spellchecker plugin to TinyMCE configuration
diff --git a/UPGRADING b/UPGRADING
index 4a4b6f29d..c450d9ed6 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -13,6 +13,8 @@ from version 1.0-beta2
 * run all commands in SQL/*.update.sql or re-initalize database with *.initial.sql
 * add these lines to /config/main.inc.php
   $rcmail_config['draft_autosave'] = 300;
+  $rcmail_config['htmleditor'] = TRUE;
+  $rcmail_config['preview_pane'] = TRUE;
 
 
 form version 0.1-beta