From c342d3defe58629f1b365a06ba5c0e38df77870a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 12 Jul 2012 15:05:33 +0000 Subject: [PATCH] Monotone-Parent: f48e9e2abfb00e03cccd2aa8fd8998a415bb5ce1 Monotone-Revision: 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-12T15:05:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3381a6eb5..a3ba33ddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,6 @@ new defaults. Also added documentation in the SOGo Installation and Configuration Guide. -<<<<<<< variant A * Updated UI/Templates/SchedulerUI/UIxCalendarProperties.wox to not show the notification options if it's a web calendar or if the active user isn't the owner of the calendar. @@ -32,29 +31,6 @@ (-resultForDAVBoolean:): new method that returns a BOOL from a DAV boolean. ->>>>>>> variant B -2012-07-10 Wolfgang Sourdeau - - * SoObjects/Appointments/SOGoAppointmentFolder.m - (-davNotifyOnPersonalModifications) - (-setDavNotifyOnPersonalModifications:) - (-davNotifyOnExternalModifications) - (-setDavNotifyOnExternalModifications:) - (-davNotifyUserOnPersonalModifications) - (-setDavNotifyUserOnPersonalModifications:) - (-davNotifiedUserOnPersonalModifications) - (-setDavNotifiedUserOnPersonalModifications:): new dav accessors. - - - * SoObjects/SOGo/SOGoObject.m (-davBooleanForResult:): new method - that returns a valid DAV boolean from a BOOL. - (-isValidDAVBoolean:): new method that validates the value as a - DAV boolean. - (-resultForDAVBoolean:): new method that returns a BOOL from a DAV - boolean. - -####### Ancestor -======= end 2012-07-09 Ludovic Marcotte * Dropped old templates (SOGoAptMailDeletionReceipt.wox