r996967 | tmcguire | 2009-07-15 10:48:30 +0200 (Wed, 15 Jul 2009) | 75 lines

Those were all merged by Allen already (thanks!!)
SVN_SILENT
SVN_MERGE
--
Recorded merge of revisions 977548,978972,978974,979061,979864,985168,989638 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

................
  r977548 | winterz | 2009-06-04 18:00:47 +0200 (Thu, 04 Jun 2009) | 19 lines
  
  Merged revisions 977496 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r977496 | winterz | 2009-06-04 09:07:36 -0400 (Thu, 04 Jun 2009) | 13 lines
    
    Lots of small changes that combine to provide a much nicer invitation experience:
    - no more "meeting" in all the strings. just general "inviations" now
    - nicer start date/time and end date/time (prints day-of-week too)
    - tells the attendee if they need to rsvp or not; if not, no longer
      put the [accept], [accept cond.], or [decline] buttons
    - determines if you have already responded; if so, no longer puts
      any buttons in the message body
    - the organizer invitation replies contain a table of all the attendees,
      along with their response status
    
    kolab/issue1190 should be fixed with this
  ........
................
  r978972 | winterz | 2009-06-08 19:37:33 +0200 (Mon, 08 Jun 2009) | 5 lines
  
  beautify invitation display. no new strings.
  
  MERGE: trunk
................
  r978974 | winterz | 2009-06-08 19:42:37 +0200 (Mon, 08 Jun 2009) | 5 lines
  
  even more beautification of invitation displays.
  String changes though.
  
  MERGE: 4.4
................
  r979061 | winterz | 2009-06-08 22:41:33 +0200 (Mon, 08 Jun 2009) | 2 lines
  
  the port of kolab/issue3685 bugfix., which I forgot to commit with the comment
................
  r979864 | winterz | 2009-06-10 18:06:56 +0200 (Wed, 10 Jun 2009) | 13 lines
  
  First part of this merge
  
  Merged revisions 979860 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r979860 | winterz | 2009-06-10 11:59:13 -0400 (Wed, 10 Jun 2009) | 4 lines
    
    implement some crash guards to in formatICalInviation.
    
    for kolab/issue3694
  ........
................
  r985168 | winterz | 2009-06-22 12:02:04 +0200 (Mon, 22 Jun 2009) | 5 lines
  
  Don't crash in invitationPerson() if the email is not found in the address book.
  should fix kolab/issue
  
  MERGE: trunk
................
  r989638 | winterz | 2009-06-30 16:45:24 +0200 (Tue, 30 Jun 2009) | 5 lines
  
  merge SVN commit 977867 by winterz:
  
  fix printing of COMMENTS and DESCRIPTION properties in invitations.
................

r996989 | tmcguire | 2009-07-15 10:57:11 +0200 (Wed, 15 Jul 2009) | 23 lines

Block cyclic merges.
SVN_MERGE
SVN_SILENT
--
Blocked revisions 990098,990227 via svnmerge

........
  r990098 | winterz | 2009-07-01 18:34:30 +0200 (Wed, 01 Jul 2009) | 4 lines
  
  merge over some fixes from trunk, mostly invitation formatting things.
  
  MERGE: none
........
  r990227 | winterz | 2009-07-02 03:31:36 +0200 (Thu, 02 Jul 2009) | 7 lines
  
  merge over most of the diffs remaining from the trunk version which provide
  much better support for timezone handling in invitations.
  
  should fix a few kolab bugs which I have yet to fully identify.
  
  MERGE: none
........

r997010 | tmcguire | 2009-07-15 11:05:51 +0200 (Wed, 15 Jul 2009) | 15 lines

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

........
  r989925 | mutz | 2009-07-01 10:55:33 +0200 (Wed, 01 Jul 2009) | 1 line
  
  Make assuan support work, and add {GpgAgent,Scd}GetInfoAssuanTransaction classes (trivial AssuanTransaction's)
........
  r990113 | mutz | 2009-07-01 19:24:46 +0200 (Wed, 01 Jul 2009) | 1 line
  
  compile against gpgme w/o assuan support
........

r997020 | tmcguire | 2009-07-15 11:10:13 +0200 (Wed, 15 Jul 2009) | 14 lines

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

........
  r992544 | mutz | 2009-07-07 10:33:57 +0200 (Tue, 07 Jul 2009) | 4 lines
  
  * Make the AssuanEngine stuff actually work.
  * Add a stricter initializeLibrary overload (the int parameter is just for disambiguation)
  * Allow to re-take ownership of AssuanTransactions and Editinteractors
  * Allow to create contexts for AssuanEngine.
........

r997051 | tmcguire | 2009-07-15 11:31:55 +0200 (Wed, 15 Jul 2009) | 14 lines

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

........
  r993922 | winterz | 2009-07-09 19:46:12 +0200 (Thu, 09 Jul 2009) | 7 lines
  
  merge e35 SVN commit r993921 by winterz:
  
  Beautify task invitations.
  Fixes kolab/issue3746
  MERGE: trunk 
........

r997052 | tmcguire | 2009-07-15 11:36:59 +0200 (Wed, 15 Jul 2009) | 10 lines

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

........
  r994464 | winterz | 2009-07-10 17:44:28 +0200 (Fri, 10 Jul 2009) | 2 lines
  
  compile with pedantic
........

r997053 | tmcguire | 2009-07-15 11:38:55 +0200 (Wed, 15 Jul 2009) | 10 lines

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

........
  r994512 | winterz | 2009-07-10 18:49:40 +0200 (Fri, 10 Jul 2009) | 2 lines
  
  compile with pedantic
........

r997057 | tmcguire | 2009-07-15 11:46:58 +0200 (Wed, 15 Jul 2009) | 12 lines

Block cylic merge.
SVN_SILENT
SVN_MERGE
Blocked revisions 996683 via svnmerge

........
  r996683 | winterz | 2009-07-14 19:26:02 +0200 (Tue, 14 Jul 2009) | 3 lines
  
  don't make cyrus-sasl2 optional, because for our purposes it isn't.
  and in kde trunk, it isn't optional anymore either.
........

r997100 | mlaurent | 2009-07-15 12:57:11 +0200 (Wed, 15 Jul 2009) | 2 lines

Fix kolab issue3645

r997489 | cgiboudeaux | 2009-07-15 23:33:27 +0200 (Wed, 15 Jul 2009) | 1 line

As discussed on the buildsystem ML, revert r982001. KDEPIMLIBS_DATA_DIR/cmake/modules will be prepended.

r997668 | ervin | 2009-07-16 11:02:28 +0200 (Thu, 16 Jul 2009) | 2 lines

Add an "Add to Favorite Folders" action.

r997766 | bbroeksema | 2009-07-16 15:10:35 +0200 (Thu, 16 Jul 2009) | 3 lines

The mail threader agent is not started by default so disable the unique agent
test for now.

r997767 | bbroeksema | 2009-07-16 15:11:12 +0200 (Thu, 16 Jul 2009) | 2 lines

enable the sqlite tests.

r997770 | bbroeksema | 2009-07-16 15:17:36 +0200 (Thu, 16 Jul 2009) | 2 lines

Revert r997767, that one wasn't meant for public consumption.