merge of 'a4c7e35d642045e63467a131fae8049524f450e4'

and 'a6b977673a1cc94b1269e19c469101dca9fd17bc'

Monotone-Parent: a4c7e35d642045e63467a131fae8049524f450e4
Monotone-Parent: a6b977673a1cc94b1269e19c469101dca9fd17bc
Monotone-Revision: f93bc9e1291ae4d3aab97f39d7a28293e66adb43

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-30T18:35:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-06-30 18:35:39 +00:00
83 changed files with 3004 additions and 1955 deletions
+42
View File
@@ -1,3 +1,45 @@
<<<<<<< variant A
2012-07-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreRecurrenceUtils.m
(-setupRecurrenceWithMasterEntity:fromRecurrencePattern:): add
exception dates to master entity based on the
"DeletedInstanceDates" member of the struct.
(-fillRecurrencePattern:withEvent:inTimeZone:inMemCtx:): new name
for fillRecurrencePattern:withStartDate:andEndDate:, add exception
dates to struct.
* OpenChange/NSDate+MAPIStore.m (NSDateCompare): new comparison
function for sorting array of NSDate instances.
2012-06-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/NSObject+MAPIStore.h: renamed
MAPIStoreTallocWrapper.MAPIStoreSOGoObject to .instance, to avoid
confusion in certain versions of GCC with our new class type.
2012-06-29 Jean Raby <jraby@inverse.ca>
* SoObjects/SOGo/WORequest+SOGo.[mh]
(-isAndroid): new method to detect whether the
request has been performed from an android client
* SoObjects/Contacts/SOGoContactFolders.m (appendSystemSources):
Let sogo append system sources if the request comes from an android
client even if its user agent matches the IPhoneAddressBook
2012-06-29 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m
(sogo_message_attachment_open_embedded_message): added the "mode"
parameter.
* OpenChange/SOGoMAPIDBObject.m: new class module that replaced
SOGoMAPIFSMessage.
* OpenChange/SOGoMAPIDBFolder.m: new class module that replaced
SOGoMAPIFSFolder.
2012-06-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m (-initWithName:inContainer:): make