From 831771c57264e4f6a54dfead219d0987754c35a7 Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Tue, 3 Jan 2012 21:11:31 +0000 Subject: [PATCH] fix changelog merge... Monotone-Parent: 71d893c6f56295ecb4a106a46e10ccc403627cc4 Monotone-Revision: 61b0fdce16f6c0727e58cc97232171b41008ed41 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-01-03T21:11:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d94447e9..14f27a35a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-01-02 Francis Lachapelle + + * UI/WebServerResources/UIxPreferences.js (getFilterFromEditor): + return a string (JSON) so the data is properly passed to the + opened window with IE7. + + * UI/WebServerResources/UIxFilterEditor.js (ensureFieldValidity): + a field value is always considered invalid when empty. + 2011-12-30 Wolfgang Sourdeau * SoObjects/SOGo/LDAPSourceSchema.[hm]: new class module enabling @@ -101,15 +110,6 @@ use of the lowercase instance of the string, which was erroneously ignored previously. -2012-01-02 Francis Lachapelle - - * UI/WebServerResources/UIxPreferences.js (getFilterFromEditor): - return a string (JSON) so the data is properly passed to the - opened window with IE7. - - * UI/WebServerResources/UIxFilterEditor.js (ensureFieldValidity): - a field value is always considered invalid when empty. - 2011-12-29 Ludovic Marcotte * SoObjects/SOGo/SOGoSQLUserProfile.m (_sqlJsonRepresentation:):