From 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 10:24:09 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 CHANGELOG |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 19585aa..dea5cda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,13 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
-- Fix excessive LFs at the end of composed message with top_posting=true (#1488797)
+- Support contacts import from CSV file (#1486399)
+- Improved keep-alive action. Now the interval is based on session_lifetime (#1488507)
+- Added cross-task 'refresh' request for system state updates (#1488507)
+- Renamed config options: keep_alive to refresh_interval, min_keep_alive to min_refresh_interval
+- Fix handling of text/enriched content on message reply/forward/edit
 - Option to display attached images as thumbnails below message body
-- Fix bug where leading blanks were stripped from quoted lines (#1488795)
-- Upgraded to jQuery 1.8.2 and jQuery UI 1.9.1
+- Upgraded to jQuery 1.8.3 and jQuery UI 1.9.1
 - Add config option to automatically generate LDAP attributes for new entries
 - Better client-side timezone detection using the jsTimezoneDetect library (#1488725)
 - Add option to disable saving sent mail in Sent folder - no_save_sent_messages (#1488686)
@@ -52,6 +55,14 @@
     Move global functions from main.inc and rcube_shared.inc into classes
     Better classes separation
 
+RELEASE 0.8.4
+-------------
+- Fix regression where unintentional page reload was done after request abort (#1488802)
+- Fix XSS vulnerability in handling of text/enriched messages (#1488806)
+- Fix handling of 'media' attribute on linked css (#1488789)
+- Fix excessive LFs at the end of composed message with top_posting=true (#1488797)
+- Fix bug where leading blanks were stripped from quoted lines (#1488795)
+
 RELEASE 0.8.3
 -------------
 - Fix AREA links handling (#1488792)

--
Gitblit v1.9.1