HomePhorge

SVN_MERGE Merged revisions 1001591 via svnmerge from svn+ssh://tmcguire@svn.
4da2c4ddb45cUnpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE Merged revisions 1001591 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

................

r1001591 | winterz | 2009-07-23 19:57:09 +0200 (Thu, 23 Jul 2009) | 72 lines

Merged revisions 1001496 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1001496 | vkrause | 2009-07-23 09:05:16 -0400 (Thu, 23 Jul 2009) | 66 lines
  
  Merge the following stuff from the ancient proko2 branch. Should fix
  various issues with invitations if you have access to a calendar of
  aanother person that is also invited.
  
  Kolab issue 3724
  
  ------------------------------------------------------------------------
  r519272 | tilladam | 2006-03-16 19:35:12 +0100 (Thu, 16 Mar 2006) | 2 lines
  
  Change the buttons to "Store" and "Throw away" as requested.
  
  ------------------------------------------------------------------------
  r513844 | tilladam | 2006-02-26 18:59:04 +0100 (Sun, 26 Feb 2006) | 2 lines
  
  Make sure the transaction is cleaned up also in the error case.
  
  ------------------------------------------------------------------------
  r513842 | tilladam | 2006-02-26 18:53:37 +0100 (Sun, 26 Feb 2006) | 4 lines
  
  In case an update or cancel message is processed for an incidence that
  cannot be found, inform the user, instead of blindly adding a new
  version of the incidence. (proko2 issue 1128)
  
  ------------------------------------------------------------------------
  r365868 | dfaure | 2004-11-24 18:19:08 +0100 (Wed, 24 Nov 2004) | 2 lines
  
  Can't update readonly events.
  
  ------------------------------------------------------------------------
  r365849 | dfaure | 2004-11-24 17:12:01 +0100 (Wed, 24 Nov 2004) | 4 lines
  
  Looking at the status is too unreliable since we have several versions of the event
  and libical gets confused - the whole point of this code is to do the equivalent
  with some more logic.
  
  ------------------------------------------------------------------------
  r365838 | dfaure | 2004-11-24 16:17:15 +0100 (Wed, 24 Nov 2004) | 2 lines
  
  Reworked logic to actually fix issue526
  
  ------------------------------------------------------------------------
  r365807 | dfaure | 2004-11-24 14:26:14 +0100 (Wed, 24 Nov 2004) | 2 lines
  
  More debug output (to get more info out of michel)
  
  ------------------------------------------------------------------------
  r365223 | dfaure | 2004-11-22 21:24:57 +0100 (Mon, 22 Nov 2004) | 3 lines
  
  Tentative fix for https://intevation.de/roundup/kolab/issue526 as discussed with Till.
  The server died so full testing isn't possible tonight though.
  
  ------------------------------------------------------------------------
  r365196 | tilladam | 2004-11-22 20:22:17 +0100 (Mon, 22 Nov 2004) | 4 lines
  
  Add an additional const QString &attendee parameter to acceptTransaction
  and acceptRequests so that we can compare which of the attendees in the
  event is the one we are supposed to act upon.
  
  ------------------------------------------------------------------------
  r364294 | tilladam | 2004-11-19 18:03:43 +0100 (Fri, 19 Nov 2004) | 4 lines
  
  Add unknown attendees which did not appear in the original event as
  voluntary/optional attendees. This happens when people reply that were
  invited as part of a server side distribution list. Patch by Bo.
........

................

svn path=/trunk/KDE/kdepimlibs/; revision=1004650

Event Timeline