LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '392bdd6ba9c324042c23ae3d8e26d2d328da895f' 

and '41bb79702e5e49315aa6313331d91aaf5357ff5f'

Monotone-Parent: 392bdd6ba9c324042c23ae3d8e26d2d328da895f
Monotone-Parent: 41bb79702e5e49315aa6313331d91aaf5357ff5f
Monotone-Revision: 4e80269c9a4c19167cb40423b5d143cad86c7adf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-02-17T22:37:16
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-02-17 22:37:16 +00:00
parent 4ec6ab9f12 6f7e03bbd3
commit a015307d4e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,9 @@
2011-02-17 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Contacts/SOGoFolder+CardDAV.m (-parseContactFilter:):
we now consider all DOM elements from the text-match element. This
fixes problems when the query contains one or more HTML entities.
2011-02-17 Ludovic Marcotte <lmarcotte@inverse.ca>
* Modified all tools to NOT check for SOGoUserSources
@ -7,6 +13,12 @@
to pass the server URL and not the host particle in order
to determine if we are using SSL or not.
2011-02-16 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
fixed a bug with IE8 that would not set the "checked" attribute
properly on a checkbox.
2011-02-15 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
@ -15,12 +27,6 @@
SOGoEnableEMailAlarms was set to YES prior doing this.
This fixes bug #1079.
2011-02-16 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
fixed a bug with IE8 that would not set the "checked" attribute
properly on a checkbox.
2011-02-14 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxDatePicker.m

7
SoObjects/Contacts/SOGoFolder+CardDAV.m
View File

@ -1,6 +1,6 @@
/* NSObject+CardDAV.m - this file is part of SOGo
*
* Copyright (C) 2007-2009 Inverse inc.
* Copyright (C) 2007-2011 Inverse inc.
*
* Author: Ludovic Marcotte <ludovic@inverse.ca>
*
@ -30,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h>
#import <NGExtensions/NSString+misc.h>
#import <DOM/DOMProtocols.h>
#import <DOM/DOMNode.h>
#import <SaxObjC/SaxObjC.h>
#import <SaxObjC/XMLNamespaces.h>
@ -142,8 +143,8 @@
&& [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
{
filterData = [NSMutableDictionary dictionary];
[filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
forKey: [filterElement attribute: @"name"]];
[filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue]
forKey: [filterElement attribute: @"name"]];
}
}