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
This commit is contained in:
Jean Raby
2012-01-03 21:11:31 +00:00
parent 444a208f86
commit 831771c572

View File

@@ -1,3 +1,12 @@
2012-01-02 Francis Lachapelle <flachapelle@inverse.ca>
* 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 <wsourdeau@inverse.ca>
* 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 <flachapelle@inverse.ca>
* 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 <lmarcotte@inverse.ca.>
* SoObjects/SOGo/SOGoSQLUserProfile.m (_sqlJsonRepresentation:):