HomePhorge

SVN_MERGE
3e63e786dd1bUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1006645,1006730,1006776,1006889,1006941,1007099,1007126,1007145,1007262,1007296,1007300,1007315,1007331,1007379-1007380,1007384,1007386,1007388,1007390-1007391,1007396,1007711 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

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

r1006645 | vkrause | 2009-08-04 10:02:03 +0200 (Tue, 04 Aug 2009) | 2 lines

Handle collection moves correctly.

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

r1006730 | vkrause | 2009-08-04 10:50:02 +0200 (Tue, 04 Aug 2009) | 2 lines

Add progress reporting and fix the move detection.

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

r1006776 | tokoe | 2009-08-04 13:16:49 +0200 (Tue, 04 Aug 2009) | 2 lines

api and apidocs cleanup

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

r1006889 | vkrause | 2009-08-04 19:05:39 +0200 (Tue, 04 Aug 2009) | 5 lines

Work in progress on improved Monitor internals.
So far this mostly consists of a small client-side FIFO cache for
collections and items to heavily reduce the number of server requests
(estimated by about 50-60%).

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

r1006941 | jtamate | 2009-08-04 20:54:41 +0200 (Tue, 04 Aug 2009) | 2 lines

The removed line said: for KDE_signal, remove in KDEPIM 4.2
It will be removed for KDEPIM 4.4 instead.

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

r1007099 | tokoe | 2009-08-05 10:51:54 +0200 (Wed, 05 Aug 2009) | 2 lines

Remove the unused ExpungeJob

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

r1007126 | tokoe | 2009-08-05 11:06:18 +0200 (Wed, 05 Aug 2009) | 2 lines

Make use of the renamed LIST/LSUB commands in the server

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

r1007145 | tokoe | 2009-08-05 11:13:16 +0200 (Wed, 05 Aug 2009) | 2 lines

Update minimum protocol version number

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

r1007262 | vkrause | 2009-08-05 13:58:32 +0200 (Wed, 05 Aug 2009) | 4 lines

Add tests for RIDs containing a ']', fails currently. Also, disable resource
agents for this test as well as they interfere with the RID tests, especially
when running in valgrind.

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

r1007296 | vkrause | 2009-08-05 15:18:51 +0200 (Wed, 05 Aug 2009) | 2 lines

oops, we missed a const here

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

r1007300 | vkrause | 2009-08-05 15:20:38 +0200 (Wed, 05 Aug 2009) | 3 lines

fix handling of invalid cache entries, fix memory leak, cleanup job
creation code, fix fetch scope handling

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

r1007315 | vkrause | 2009-08-05 16:10:09 +0200 (Wed, 05 Aug 2009) | 2 lines

make krazy happy

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

r1007331 | vkrause | 2009-08-05 16:45:56 +0200 (Wed, 05 Aug 2009) | 2 lines

make valgrind happy

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

r1007379 | winterz | 2009-08-05 19:24:02 +0200 (Wed, 05 Aug 2009) | 13 lines

merge SVN commit 1007376 by winterz from e4 to trunk

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

........
  r1007373 | winterz | 2009-08-05 13:14:29 -0400 (Wed, 05 Aug 2009) | 4 lines
  
  Revert the remaining parts of SVN commit 1004175 that caused 
  the [Accept], etc. buttons not to be shown on updated invitation mails.
........

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

r1007380 | winterz | 2009-08-05 19:24:44 +0200 (Wed, 05 Aug 2009) | 2 lines

revertlast

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

r1007384 | tmcguire | 2009-08-05 19:31:16 +0200 (Wed, 05 Aug 2009) | 19 lines

SVN_SILENT
--
Recorded merge of revisions 1007376 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

................
  r1007376 | winterz | 2009-08-05 19:20:12 +0200 (Wed, 05 Aug 2009) | 10 lines
  
  Merged revisions 1007373 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1007373 | winterz | 2009-08-05 13:14:29 -0400 (Wed, 05 Aug 2009) | 4 lines
    
    Revert the remaining parts of SVN commit 1004175 that caused 
    the [Accept], etc. buttons not to be shown on updated invitation mails.
  ........
................

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

r1007386 | tmcguire | 2009-08-05 19:34:41 +0200 (Wed, 05 Aug 2009) | 55 lines

SVN_SILENT
--
Blocked revisions 1004974 via svnmerge

................
  r1004974 | tmcguire | 2009-07-31 11:17:01 +0200 (Fri, 31 Jul 2009) | 47 lines
  
  Block everything.
  SVN_SILENT
  --
  Blocked revisions 1001171,1001791,1002820,1003251,1003998,1004326 via svnmerge
  
  ................
    r1001171 | tmcguire | 2009-07-22 18:35:30 +0200 (Wed, 22 Jul 2009) | 16 lines
    
    Backport r1000903 by tmcguire from trunk to the 4.3 branch:
    
    SVN_MERGE
    Merged revisions 999727 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
    
    ........
      r999727 | winterz | 2009-07-20 14:21:25 +0200 (Mon, 20 Jul 2009) | 5 lines
      
      allow a semicolon as an address separator.
      fixes kolab/issue3634
      
      MERGE: trunk,4.3
    ........
  ................
    r1001791 | vkrause | 2009-07-24 11:32:41 +0200 (Fri, 24 Jul 2009) | 5 lines
    
    Like done in previous releases, protect against build breakage caused by
    D-Bus interface extensions in future versions. The interface extensions
    as such are not SIC/BIC in any way, but the code generator can't cope
    with it.
  ................
    r1002820 | scripty | 2009-07-27 05:15:15 +0200 (Mon, 27 Jul 2009) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ................
    r1003251 | mueller | 2009-07-28 00:03:53 +0200 (Tue, 28 Jul 2009) | 2 lines
    
    bump version
  ................
    r1003998 | scripty | 2009-07-29 05:35:59 +0200 (Wed, 29 Jul 2009) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ................
    r1004326 | mueller | 2009-07-29 23:08:01 +0200 (Wed, 29 Jul 2009) | 2 lines
    
    bump akonadi require
  ................
................

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

r1007388 | tmcguire | 2009-08-05 19:36:49 +0200 (Wed, 05 Aug 2009) | 20 lines

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

................
  r1006338 | winterz | 2009-08-03 16:13:16 +0200 (Mon, 03 Aug 2009) | 12 lines
  
  Merged revisions 1006335 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1006335 | winterz | 2009-08-03 10:06:46 -0400 (Mon, 03 Aug 2009) | 5 lines
    
    Revert parts of SVN commit 1004175 which caused regressions in invitation handling.
    Should fix critical kolab issues 3685 and 3789
    
    MERGE: e4,trunk,4.3.1
  ........
................

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

r1007390 | tmcguire | 2009-08-05 19:38:22 +0200 (Wed, 05 Aug 2009) | 15 lines

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

........
  r1006407 | winterz | 2009-08-03 19:49:41 +0200 (Mon, 03 Aug 2009) | 7 lines
  
  merge SVN revision 1004591 by winterz from e35
  
  a better fix for kolab/issue3780 that deals with events to delete that cannot
  be found in the user's calendar.
  
  MERGE: trunk
........

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

r1007391 | tmcguire | 2009-08-05 19:39:23 +0200 (Wed, 05 Aug 2009) | 19 lines

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

................
  r1006811 | winterz | 2009-08-04 16:17:01 +0200 (Tue, 04 Aug 2009) | 11 lines
  
  Merged revisions 1006810 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1006810 | winterz | 2009-08-04 10:12:07 -0400 (Tue, 04 Aug 2009) | 4 lines
    
    Always allow the invitation to be removed from the user's calendar.
    Fixes critical kolab/issue3779
    MERGE: e4,trunk,4.3.1
  ........
................

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

r1007396 | winterz | 2009-08-05 19:53:05 +0200 (Wed, 05 Aug 2009) | 4 lines

"task" -> "to-do"
MERGE: none (already in e4)
DO_NOT_BACKPORT: i18n string change

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

r1007711 | vkrause | 2009-08-06 09:32:56 +0200 (Thu, 06 Aug 2009) | 3 lines

Missed one, the argument for join has to be a const char* though, so
that one is indeed correct.

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

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1007735

Event Timeline

Volker Krause <vkrause@kde.org> committed rKPL3e63e786dd1b: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Aug 6 2009, 10:42 AM

Merged Changes