r1037418 | winterz | 2009-10-19 03:00:50 +0200 (Mon, 19 Oct 2009) | 4 lines

revert. sigh.
I must have made this mistake a dozen times by now.

r1071153 | skelly | 2010-01-07 17:34:59 +0100 (Thu, 07 Jan 2010) | 1 line

Add some stuff to work on later.

r1071317 | tmcguire | 2010-01-07 21:57:09 +0100 (Thu, 07 Jan 2010) | 13 lines

Looks like the check is already correct here.
SVN_MERGE
SVN_SILENT
Blocked revisions 1058685 via svnmerge

........
  r1058685 | mutz | 2009-12-04 23:59:13 +0100 (Fri, 04 Dec 2009) | 3 lines
  
  Make the requirement on Boost >= 1.34 that is implicit in the code, explicit.
  
  CCMAIL:winter@kde.org
........

r1071324 | tmcguire | 2010-01-07 22:04:21 +0100 (Thu, 07 Jan 2010) | 121 lines

Block cyclic merges, blocks, release stuff and one unwanted commit (Akonadi will fix that)
SVN_MERGE
SVN_SILENT
Blocked revisions 1067554,1067814,1067895,1067917,1067945,1068315,1068602,1068604,1068629,1070428 via svnmerge

................
  r1067554 | winterz | 2009-12-29 21:21:25 +0100 (Tue, 29 Dec 2009) | 14 lines
  
  Merged revisions 1067503 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1067503 | tmcguire | 2009-12-29 12:54:44 -0500 (Tue, 29 Dec 2009) | 7 lines
    
    Add _very_ nasty hack: After deleting an attachment, automatically select the next message that
    arrives in the message list, so the 'same' mail stays selected.
    
    This is needed because KMDeleteAttachmentCommand does an add+delete.
    
    kolab/issue3740
  ........
................
  r1067814 | winterz | 2009-12-30 18:11:20 +0100 (Wed, 30 Dec 2009) | 13 lines
  
  Merged revisions 1067806 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1067806 | winterz | 2009-12-30 11:47:41 -0500 (Wed, 30 Dec 2009) | 6 lines
    
    refactor some things, especially the counter proposal buttons.
    note when an invitation is in delegation.
    
    along with some other cleanups to make merging with kde4 version a little easier.
    MERGE: e4,4.5
  ........
................
  r1067895 | winterz | 2009-12-30 22:31:38 +0100 (Wed, 30 Dec 2009) | 14 lines
  
  Merged revisions 1067880 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1067880 | winterz | 2009-12-30 16:03:24 -0500 (Wed, 30 Dec 2009) | 8 lines
    
    factor out a new static method firstAttendeeName() and use this in
    the invitation headers for Events and Todos.  This gives us more
    instances where the headers have a specific name rather than 
    the general "Sender"
    
    MERGE: e4,4.5
  ........
................
  r1067917 | winterz | 2009-12-30 23:54:44 +0100 (Wed, 30 Dec 2009) | 14 lines
  
  Merged revisions 1067913 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1067913 | winterz | 2009-12-30 17:48:52 -0500 (Wed, 30 Dec 2009) | 8 lines
    
    add a hook for a possible future hack where REPLY methods really
    should be COUNTER methods, but the sending software is broken.
    which might be the case for a version of Outlook... don't know yet.
    see kolab/issue3665
    
    MERGE: e4,4.5
  ........
................
  r1067945 | winterz | 2009-12-31 01:00:53 +0100 (Thu, 31 Dec 2009) | 11 lines
  
  Blocked revisions 1067944 via svnmerge
  
  ........
    r1067944 | winterz | 2009-12-30 18:57:16 -0500 (Wed, 30 Dec 2009) | 5 lines
    
    align all 3 splitters, and align the timelabels to the grid.
    kolab/issue2656
    
    MERGE: none (something similar in e4 and trunk already)
  ........
................
  r1068315 | winterz | 2009-12-31 22:25:47 +0100 (Thu, 31 Dec 2009) | 3 lines
  
  fix the markup in one of the tips
  MERGE: none (already in trunk)
................
  r1068602 | tmcguire | 2010-01-01 18:29:57 +0100 (Fri, 01 Jan 2010) | 1 line
  
  Update Newslog.txt
................
  r1068604 | tmcguire | 2010-01-01 18:30:47 +0100 (Fri, 01 Jan 2010) | 1 line
  
  SVN_SILENT Update version numbers for today's release.
................
  r1068629 | winterz | 2010-01-01 19:14:27 +0100 (Fri, 01 Jan 2010) | 12 lines
  
  Blocked revisions 1068600,1068603 via svnmerge
  
  ........
    r1068600 | tmcguire | 2010-01-01 12:19:30 -0500 (Fri, 01 Jan 2010) | 1 line
    
    Update Newslog.txt
  ........
    r1068603 | tmcguire | 2010-01-01 12:30:47 -0500 (Fri, 01 Jan 2010) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ........
................
  r1070428 | winterz | 2010-01-05 17:24:45 +0100 (Tue, 05 Jan 2010) | 9 lines
  
  Blocked revisions 1070422 via svnmerge
  
  ........
    r1070422 | winterz | 2010-01-05 11:15:55 -0500 (Tue, 05 Jan 2010) | 3 lines
    
    fix no such signal KOEventPopupMenu::configChanged()
    MERGE: none (already in e4 and trunk)
  ........
................

r1071342 | lueck | 2010-01-07 22:35:23 +0100 (Thu, 07 Jan 2010) | 2 lines

doc update by Jay Woods
CCMAIL:woodsjay@cox.net

r1071353 | tmcguire | 2010-01-07 22:45:23 +0100 (Thu, 07 Jan 2010) | 47 lines

Block 3 empty merges I missed earlier
SVN_MERGE
SVN_SILENT
Blocked revisions 1063998,1065144,1066773 via svnmerge

................
  r1063998 | winterz | 2009-12-19 21:07:33 +0100 (Sat, 19 Dec 2009) | 10 lines
  
  Merged revisions 1063936 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1063936 | winterz | 2009-12-19 11:06:19 -0500 (Sat, 19 Dec 2009) | 3 lines
    
    fine-tune some invitation status messages.
    MERGE: e4,4.5 (new i18n strings)
  ........
................
  r1065144 | winterz | 2009-12-22 17:22:36 +0100 (Tue, 22 Dec 2009) | 11 lines
  
  Merged revisions 1065138 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1065138 | winterz | 2009-12-22 11:12:36 -0500 (Tue, 22 Dec 2009) | 4 lines
    
    Do better detecting if the recieiver has already responded to invitation.
    kolab/issue3988
    MERGE: e4,4.5 (new i18n string)
  ........
................
  r1066773 | winterz | 2009-12-27 23:08:04 +0100 (Sun, 27 Dec 2009) | 13 lines
  
  Merged revisions 1066653 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1066653 | winterz | 2009-12-27 11:27:41 -0500 (Sun, 27 Dec 2009) | 7 lines
    
    if the delegated attendee declines, then the make sure the normal response
    buttons are shown on the decline message.
    kolab/issue4000
    
    MERGE: e4,4.5
  ........
................

r1071363 | tmcguire | 2010-01-07 22:57:17 +0100 (Thu, 07 Jan 2010) | 11 lines

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

........
  r1067474 | tmcguire | 2009-12-29 17:38:02 +0100 (Tue, 29 Dec 2009) | 1 line
  
  Compile
........

r1071391 | winterz | 2010-01-07 23:22:13 +0100 (Thu, 07 Jan 2010) | 18 lines

Blocked revisions 1071390 via svnmerge

................
  r1071390 | winterz | 2010-01-07 17:19:58 -0500 (Thu, 07 Jan 2010) | 12 lines
  
  Merged revisions 1071388 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r1071388 | winterz | 2010-01-07 17:18:04 -0500 (Thu, 07 Jan 2010) | 5 lines
    
    backport SVN commit 1071342 by lueck:
    
    doc update by Jay Woods
    MERGE: e4 (already in trunk)
  ........
................

r1071976 | tmcguire | 2010-01-09 09:52:08 +0100 (Sat, 09 Jan 2010) | 3 lines

Enable dist list expansion again. We do SPARQL searches for the crypto
key resolver anyway, so it should better work.

r1072067 | smartins | 2010-01-09 12:30:00 +0100 (Sat, 09 Jan 2010) | 4 lines

Open the combo when clicking on the default text.

Review: http://reviewboard.kde.org/r/2532

r1072143 | otrichet | 2010-01-09 14:36:40 +0100 (Sat, 09 Jan 2010) | 1 line

Remove code to convert data from version <= 0.4 (released in February 2001 with KDE 2.1)

r1072144 | otrichet | 2010-01-09 14:36:43 +0100 (Sat, 09 Jan 2010) | 3 lines

Add a kconf_update

 - Remove some unused groups and keys

r1072145 | otrichet | 2010-01-09 14:36:46 +0100 (Sat, 09 Jan 2010) | 1 line

Fix "all headers style" in the article widget

r1072146 | otrichet | 2010-01-09 14:36:49 +0100 (Sat, 09 Jan 2010) | 3 lines

Use custom error message when posting fails.

Default KIO message is for error to write into file.

r1072147 | otrichet | 2010-01-09 14:36:52 +0100 (Sat, 09 Jan 2010) | 1 line

Correct the extraction of i18n message.

r1072148 | otrichet | 2010-01-09 14:36:56 +0100 (Sat, 09 Jan 2010) | 1 line

Use KLocale::formatByteSize() instead of some old code

r1072266 | winterz | 2010-01-09 20:24:40 +0100 (Sat, 09 Jan 2010) | 5 lines

timchen119's patch for supporting Unicode in notes.
thanks for the patch!
BUG:220766
MERGE: 4.4

r1072297 | golnazn | 2010-01-09 22:30:26 +0100 (Sat, 09 Jan 2010) | 1 line

When no blog is selected in the toolbar, "Open in browser" does nothing to avoid crash.

r1072593 | mlaurent | 2010-01-10 14:03:18 +0100 (Sun, 10 Jan 2010) | 2 lines

Remove duplicate line

r1072597 | mlaurent | 2010-01-10 14:06:45 +0100 (Sun, 10 Jan 2010) | 2 lines

It doesn't compile with enable-final

r1072599 | mlaurent | 2010-01-10 14:13:12 +0100 (Sun, 10 Jan 2010) | 2 lines

Fix compile with enable-final

r1072601 | mlaurent | 2010-01-10 14:14:11 +0100 (Sun, 10 Jan 2010) | 2 lines

Doesn't compile with enable-final

r1072619 | tokoe | 2010-01-10 15:24:34 +0100 (Sun, 10 Jan 2010) | 2 lines

Bring back actions that allows to reload an folder