Home GnuPG

Description

SVN_MERGE

Merged revisions 1040949,1041115,1041117,1041334,1042127,1042207,1042240,1042248,1042264,1042275,1042280,1042297,1042313,1042335,1042349,1042659 via svnmerge from
svn+ssh://skelly@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

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

r1040949 | tmcguire | 2009-10-27 10:41:18 +0100 (Tue, 27 Oct 2009) | 47 lines

Block cyclic merges and Windows build fixes which are (hopefully) not needed here.

SVN_MERGE                                                                         
SVN_SILENT                                                                        
Blocked revisions 1033321,1033323,1038909,1038911 via svnmerge                    

................                                                                  
  r1033321 | tmcguire | 2009-10-09 23:45:09 +0200 (Fri, 09 Oct 2009) | 14 lines   

  SVN_MERGE                                                                       
  SVN_SILENT                                                                      
  Blocked revisions 1030495,1031785 via svnmerge                                  

  ........                                                                        
    r1030495 | mueller | 2009-10-02 13:46:41 +0200 (Fri, 02 Oct 2009) | 2 lines   

    bump version                                                                  
  ........                                                                        
    r1031785 | scripty | 2009-10-06 05:00:14 +0200 (Tue, 06 Oct 2009) | 1 line    

    SVN_SILENT made messages (.desktop file)                                      
  ........                                                                        
................                                                                  
  r1033323 | tmcguire | 2009-10-09 23:47:11 +0200 (Fri, 09 Oct 2009) | 13 lines   

  Merged revisions 1031598 via svnmerge from                                      
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs             

  ........                                                                        
    r1031598 | tnyblom | 2009-10-05 15:44:58 +0200 (Mon, 05 Oct 2009) | 7 lines   

    Backport r1028946 by tnyblom from trunk to the 4.3 branch:                    

    This makes KMime allow a trailing dot in domain names as per the RFC.         

    CCBUG: 139477                                                                 
  ........                                                                        
................                                                                  
  r1038909 | pokrzywka | 2009-10-22 11:28:24 +0200 (Thu, 22 Oct 2009) | 1 line    

  missing libs                                                                    
................                                                                  
  r1038911 | pokrzywka | 2009-10-22 11:35:35 +0200 (Thu, 22 Oct 2009) | 1 line    

  missing QtGui lib here too                                                      
................

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

r1041115 | tmcguire | 2009-10-27 13:05:01 +0100 (Tue, 27 Oct 2009) | 1 line       

SVN_SILENT on second thought, unblock those, I want to merge them for real.

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

r1041117 | tmcguire | 2009-10-27 13:10:21 +0100 (Tue, 27 Oct 2009) | 16 lines     

After unblocking those, it turned out somebody else fixed exactly those issues :O 
SVN_MERGE                                                                         
SVN_SILENT                                                                        
Recorded merge of revisions 1038909,1038911 via svnmerge from                     
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs    

........                                                                          
  r1038909 | pokrzywka | 2009-10-22 11:28:24 +0200 (Thu, 22 Oct 2009) | 1 line    

  missing libs                                                                    
........                                                                          
  r1038911 | pokrzywka | 2009-10-22 11:35:35 +0200 (Thu, 22 Oct 2009) | 1 line    

  missing QtGui lib here too                                                      
........

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

r1041334 | cgiboudeaux | 2009-10-27 21:39:31 +0100 (Tue, 27 Oct 2009) | 7 lines   

Public holiday for Luxembourg.                                                    

Thanks to Georges Toth (gtoth at trypill org) for the data.                       

(a German translation would be welcome)

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

r1042127 | tokoe | 2009-10-29 10:26:55 +0100 (Thu, 29 Oct 2009) | 4 lines         

Make the auto completion case insensitive                                         

BUG: 212225

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

r1042207 | tokoe | 2009-10-29 11:23:33 +0100 (Thu, 29 Oct 2009) | 5 lines         

Always set the cursor to the name column in the                                   
last row after deleting a member from the group                                   

BUG: 212230

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

r1042240 | tokoe | 2009-10-29 11:56:53 +0100 (Thu, 29 Oct 2009) | 3 lines

Don't show empty <> for contact references with no
email addresses assigned

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

r1042248 | skelly | 2009-10-29 12:25:29 +0100 (Thu, 29 Oct 2009) | 1 line

Make it possible to retrieve Akonadi:/ urls for entities and retrieve by url.

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

r1042264 | tokoe | 2009-10-29 14:03:06 +0100 (Thu, 29 Oct 2009) | 2 lines

codingstyle cleanup

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

r1042275 | winterz | 2009-10-29 15:10:52 +0100 (Thu, 29 Oct 2009) | 13 lines

Merged revisions 1042271 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

........
  r1042271 | winterz | 2009-10-29 10:03:44 -0400 (Thu, 29 Oct 2009) | 7 lines

  add home and business post office box fields
  approved by tokoe
  kolab/issue3843

  MERGE: trunk
........

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

r1042280 | tokoe | 2009-10-29 15:18:12 +0100 (Thu, 29 Oct 2009) | 2 lines

Update labels for CutItems/Collections actions correctly

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

r1042297 | skelly | 2009-10-29 16:10:53 +0100 (Thu, 29 Oct 2009) | 1 line

Add some asserts in case unique negative collection id is causing problems.

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

r1042313 | skelly | 2009-10-29 16:53:51 +0100 (Thu, 29 Oct 2009) | 1 line

Make sure that parentCollection heirarchies are fetched when fetching Items.

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

r1042335 | tokoe | 2009-10-29 17:45:48 +0100 (Thu, 29 Oct 2009) | 3 lines

Give the drop menu a similar appearance to the drop menu
in Dolphin

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

r1042349 | tokoe | 2009-10-29 18:04:07 +0100 (Thu, 29 Oct 2009) | 5 lines

Fix the conditions for enabling certain actions

It should never be possible to change directly the root collection
or a resource collection

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

r1042659 | tokoe | 2009-10-30 13:46:22 +0100 (Fri, 30 Oct 2009) | 3 lines

Optimization: Do not allocate a new Collection if we return
a copy anyway.

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

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

Event Timeline

Stephen Kelly <steveire@gmail.com> committed rGPGMEPPd494c88aec3f: SVN_MERGE (authored by Stephen Kelly <steveire@gmail.com>).Oct 30 2009, 2:09 PM

Empty Commit

This commit is empty and does not affect any paths.