From 06410e41e0e0ac4503cd88df48480afe5033dba7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 19 Dec 2014 03:35:03 -0500
Subject: [PATCH] Update changelog

---
 CHANGELOG |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 544925d..290895f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -71,7 +71,10 @@
 
 RELEASE 1.0.4
 -------------
-- Fix generation of Blowfish-based password hashes (#1490184)
+- Disable TinyMCE contextmenu plugin as there are more cons than pros in using it (#1490118)
+- Fix bug where show_real_foldernames setting wasn't honored on compose page (#1490153)
+- Fix issue where Archive folder wasn't protected in Folder Manager (#1490154)
+- Fix compatibility with PHP 5.2. in rcube_imap_generic (#1490115)
 - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
 - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
 - Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103)
@@ -84,6 +87,8 @@
 - Fix reply scrolling issue with text mode and start message below the quote (#1490114)
 - Fix possible issues in skin/skin_path config handling (#1490125)
 - Fix lack of delimiter for recipient addresses in smtp_log (#1490150)
+- Fix generation of Blowfish-based password hashes (#1490184)
+- Fix bugs where CSRF attacks were still possible on some requests
 
 RELEASE 1.0.3
 -------------

--
Gitblit v1.9.1