propagate from branch 'ca.inverse.sogo.1_3_12' (head f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c)
to branch 'ca.inverse.sogo' (head 57bf65070b9e7165596b27d1753f3eecf15f29f9) Monotone-Parent: 57bf65070b9e7165596b27d1753f3eecf15f29f9 Monotone-Parent: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c Monotone-Revision: deed692cb3c352022ee720bc7f7b2d91e734367b Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-01-25T20:28:28 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
128a05501a
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2012-01-25 Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||
|
||||
* SOPE/GDLContentStore/GCSFolder.m - we now use the proper
|
||||
method to determine column types, avoiding the generation
|
||||
of broken UPDATE statements on MySQL when snoozing alarms.
|
||||
|
||||
2012-01-24 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to
|
||||
latin-1 when utf-8 decoding doesn't work.
|
||||
|
||||
2012-01-19 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/UIxMailToSelection.js
|
||||
|
|
1
NEWS
1
NEWS
|
@ -9,6 +9,7 @@ Enhancements
|
|||
- updated Ukrainian translation
|
||||
- now possible to use memcached over a UNIX socket
|
||||
- increase size of content columns
|
||||
- improved import of .ics files
|
||||
|
||||
Bug Fixes
|
||||
- alarms for tasks now depend on the start date and instead of the due date
|
||||
|
|
|
@ -832,7 +832,7 @@ andAttribute: (EOAttribute *)_attribute
|
|||
EOSQLQualifier *qualifier;
|
||||
EOAttribute *attribute1, *attribute2;
|
||||
|
||||
attribute1 = [_entity attributeNamed: _colname];
|
||||
attribute1 = [self _attributeForColumn: _colname];
|
||||
if (_colname2 == nil)
|
||||
{
|
||||
qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
|
||||
|
@ -842,7 +842,7 @@ andAttribute: (EOAttribute *)_attribute
|
|||
}
|
||||
else
|
||||
{
|
||||
attribute2 = [_entity attributeNamed: _colname2];
|
||||
attribute2 = [self _attributeForColumn: _colname2];
|
||||
qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity
|
||||
qualifierFormat: @"%A = %@ AND %A = %@",
|
||||
_colname,
|
||||
|
|
|
@ -72,6 +72,9 @@
|
|||
{
|
||||
fileContent = [[NSString alloc] initWithData: (NSData *) data
|
||||
encoding: NSUTF8StringEncoding];
|
||||
if (fileContent == nil)
|
||||
fileContent = [[NSString alloc] initWithData: (NSData *) data
|
||||
encoding: NSISOLatin1StringEncoding];
|
||||
[fileContent autorelease];
|
||||
}
|
||||
|
||||
|
|
|
@ -745,7 +745,7 @@ _userStateInEvent (NSArray *event)
|
|||
[currentDay addObject: eventBlock];
|
||||
}
|
||||
else
|
||||
[self warnWithFormat: @"event '%@' has end < start: %d < %d",
|
||||
[self warnWithFormat: @"event '%@' has end <= start: %d < %d",
|
||||
[event objectAtIndex: eventNameIndex], eventEnd, currentStart];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue