1. 25 Nov, 2010 1 commit
  2. 16 Nov, 2010 1 commit
  3. 25 Sep, 2010 1 commit
  4. 11 Aug, 2010 1 commit
  5. 27 Jul, 2010 2 commits
  6. 12 Jul, 2010 1 commit
  7. 05 Jul, 2010 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 1a84b2f6
      Volker Krause authored
      Merged revisions 1143955,1143988,1143994,1144010,1144026,1144033,1144056,1144060,1144063,1144065,1144068-1144071,1144076,1144079,1144081,1144083-1144084,1144093-1144094,1144098-1144100,1144102,1144104,1144106-1144107,1144109-1144110,1144113,1144121,1144126-1144130,1144133-1144135,1144137-1144138,1144141,1144143-1144149,1144151-1144153,1144155,1144157-1144159,1144162,1144168,1144170,1144172-1144173,1144175,1144178,1144184,1144186-1144187,1144190-1144193,1144196,1144202-1144205,1144207,1144260,1144268,1144276,1144281,1144291,1144304-1144305,1144366-1144368,1144370,1144386,1144401,1144411,1144451,1144531,1144540,1144618,1144640,1144674,1144684,1144687,1144690,1144717,1144722 via svnmerge from 
      svn+ssh://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1143955 | cgiboudeaux | 2010-06-29 10:45:10 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Bump version.
      ................
        r1143988 | cgiboudeaux | 2010-06-29 11:29:28 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Bump version. Trunk is now 4.6 pre
      ................
        r1143994 | tmcguire | 2010-06-29 11:38:32 +0200 (Tue, 29 Jun 2010) | 1 line
        
        bump version
      ................
        r1144010 | skelly | 2010-06-29 12:01:50 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Update with kdepimlibs version.
      ................
        r1144026 | skelly | 2010-06-29 12:27:20 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Fix silly error using wrong index.
      ................
        r1144033 | scripty | 2010-06-29 12:28:51 +0200 (Tue, 29 Jun 2010) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1144056 | winterz | 2010-06-29 12:48:50 +0200 (Tue, 29 Jun 2010) | 4 lines
        
        use Nuno's new icon for posting to a mailing list.
        he named it mail-list-message-new instead of mail-message-new-list
      ................
        r1144060 | tmcguire | 2010-06-29 12:58:51 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117561 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117561 | mutz | 2010-04-22 15:54:08 +0200 (Thu, 22 Apr 2010) | 1 line
          
          Input: allow to pass a QByteArray to the process' stdin
        ........
      ................
        r1144063 | tmcguire | 2010-06-29 13:01:46 +0200 (Tue, 29 Jun 2010) | 17 lines
        
        SVN_MERGE:
        Merged revisions 1117562 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117562 | mutz | 2010-04-22 15:54:09 +0200 (Thu, 22 Apr 2010) | 8 lines
          
          ArchiveDefinition: Extend syntax of pack-command config key to allow passing filenames via stdin:
          
          1. newline-separated: pack-command=|command
          2. nul-byte-separated: pack-command=0|command
          
          Tested with pack-command=0|xargs -0 tar cf - on Linux.
          
          Implements kolab/issue4298 (gpg4win2).
        ........
      ................
        r1144065 | tmcguire | 2010-06-29 13:06:52 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117592 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117592 | mutz | 2010-04-22 16:58:52 +0200 (Thu, 22 Apr 2010) | 1 line
          
          doc/kleopatra: Document [Archive Definition #n] config keys.
        ........
      ................
        r1144068 | tmcguire | 2010-06-29 13:08:11 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117829 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117829 | mutz | 2010-04-23 09:48:38 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: mention that quoting works
        ........
      ................
        r1144069 | tmcguire | 2010-06-29 13:09:15 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117830 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117830 | mutz | 2010-04-23 09:48:41 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: add a note about backslashes in [Archive Definition]/pack-command
        ........
      ................
        r1144070 | tmcguire | 2010-06-29 13:00:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117831 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117831 | mutz | 2010-04-23 09:48:43 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: better formatting of one-line <programlisting>s
        ........
      ................
        r1144071 | tmcguire | 2010-06-29 13:11:29 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117832 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117832 | mutz | 2010-04-23 09:48:45 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: <variablelist> -> <orderedlist> in discussion about filename passing to archivers
        ........
      ................
        r1144076 | tmcguire | 2010-06-29 13:12:29 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117933 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117933 | mutz | 2010-04-23 15:23:37 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: use <envar> instead of <varname> for environment variables
        ........
      ................
        r1144079 | tmcguire | 2010-06-29 13:13:28 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117934 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117934 | mutz | 2010-04-23 15:23:40 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: ++ids
        ........
      ................
        r1144081 | tmcguire | 2010-06-29 13:14:27 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117935 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117935 | mutz | 2010-04-23 15:23:42 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: make the filename passing discussion a <sect2>
        ........
      ................
        r1144083 | tmcguire | 2010-06-29 13:15:26 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117936 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117936 | mutz | 2010-04-23 15:23:44 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: document [Checksum Definition #n] config keys
        ........
      ................
        r1144084 | tmcguire | 2010-06-29 13:16:28 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1117937 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1117937 | mutz | 2010-04-23 15:23:46 +0200 (Fri, 23 Apr 2010) | 1 line
          
          doc/kleopatra: adjust copyrights of Kleopatra and her documentation
        ........
      ................
        r1144093 | winterz | 2010-06-29 13:34:41 +0200 (Tue, 29 Jun 2010) | 3 lines
        
        the mail-list-message-new icon was renamed to mail-message-new-list,
        per Pino and Nuno.
      ................
        r1144094 | lfranchi | 2010-06-29 13:35:39 +0200 (Tue, 29 Jun 2010) | 2 lines
        
        Don't allow user to save encrypted draft with no recipient.
      ................
        r1144098 | tmcguire | 2010-06-29 13:41:48 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1118263 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1118263 | mutz | 2010-04-24 09:16:32 +0200 (Sat, 24 Apr 2010) | 1 line
          
          ArchiveDefinition: fix assertion
        ........
      ................
        r1144099 | tmcguire | 2010-06-29 13:43:10 +0200 (Tue, 29 Jun 2010) | 16 lines
        
        SVN_MERGE:
        Merged revisions 1118264 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1118264 | mutz | 2010-04-24 09:16:35 +0200 (Sat, 24 Apr 2010) | 7 lines
          
          ChecksumDefinition: allow same argument passing options as ArchiveDefinition
          
          1. Parse '|' and '0|' prefixes of commands
          2. Move responsibility for starting processes to ChecksumDefinition
             (from Create/VerifyChecksumsController)
          
          Implements kolab/issue4294.
        ........
      ................
        r1144100 | tmcguire | 2010-06-29 13:44:18 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1118265 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1118265 | mutz | 2010-04-24 09:16:37 +0200 (Sat, 24 Apr 2010) | 1 line
          
          ProcessStdOutInput: add missing return statement
        ........
      ................
        r1144102 | tmcguire | 2010-06-29 13:45:24 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1118266 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1118266 | mutz | 2010-04-24 09:16:39 +0200 (Sat, 24 Apr 2010) | 1 line
          
          ArchiveDefiniton, ChecksumDefinition: don't pass filenames on the command line when passing them on stdin already
        ........
      ................
        r1144104 | tmcguire | 2010-06-29 13:51:38 +0200 (Tue, 29 Jun 2010) | 19 lines
        
        SVN_MERGE:
        Merged revisions 1118267 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1118267 | mutz | 2010-04-24 09:16:42 +0200 (Sat, 24 Apr 2010) | 10 lines
          
          libkleopatrarc: make argument passing more robust for Archive and Checksum Definitions
          
          This requires GNU-compatible tools (for -- and tar --null), and a POSIX system (for xargs),
          so it won't work on Windows out of the box (it never did, anyway, unless you had the tools
          in PATH). ZIP cannot be called safely, since it accepts options after positional parameters,
          doesn't support --, and can accept filenames on stdin only in a newline-separated way (which
          breaks when filenames contain newlines).
          
          We might need a way to specify which platform a given Archive Definition / Checksum Definition
          is compatible with...
        ........
      ................
        r1144106 | tmcguire | 2010-06-29 13:53:55 +0200 (Tue, 29 Jun 2010) | 13 lines
        
        SVN_MERGE:
        Merged revisions 1119583 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119583 | mutz | 2010-04-27 14:54:15 +0200 (Tue, 27 Apr 2010) | 4 lines
          
          MainWindow; revert commit 1010968
          
          There is no such thing as a "secret certificate"...
          CCMAIL:mcguire@kde.org
        ........
      ................
        r1144107 | tmcguire | 2010-06-29 13:55:29 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1119584 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119584 | mutz | 2010-04-27 14:54:18 +0200 (Tue, 27 Apr 2010) | 3 lines
          
          kleopatra.rc: remove old action name
          
          It's been called crl_import_crls for some time now.
        ........
      ................
        r1144109 | mutz | 2010-06-29 13:56:11 +0200 (Tue, 29 Jun 2010) | 1 line
        
        messagefactorytest.cpp: output diffs of (long) string mismatches
      ................
        r1144110 | lfranchi | 2010-06-29 13:57:15 +0200 (Tue, 29 Jun 2010) | 2 lines
        
        Fix wrong logic
      ................
        r1144113 | tmcguire | 2010-06-29 13:59:56 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119585 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119585 | mutz | 2010-04-27 14:54:20 +0200 (Tue, 27 Apr 2010) | 1 line
          
          checksumdefinition.cpp: compile on platforms that #define stdin
        ........
      ................
        r1144121 | smartins | 2010-06-29 14:11:06 +0200 (Tue, 29 Jun 2010) | 11 lines
        
        Recorded merge of revisions 1144116 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1144116 | smartins | 2010-06-29 13:07:01 +0100 (Tue, 29 Jun 2010) | 4 lines
          
          Backport beginBatchAdding and endBatchAdding signals from trunk
          
          MERGE: none
        ........
      ................
        r1144126 | tmcguire | 2010-06-29 14:14:45 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119586 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119586 | mutz | 2010-04-27 14:54:23 +0200 (Tue, 27 Apr 2010) | 1 line
          
          doc/kleopatra: <link>..lots of repetition...</link> --> <xref/>
        ........
      ................
        r1144127 | tmcguire | 2010-06-29 14:15:46 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119587 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119587 | mutz | 2010-04-27 14:54:26 +0200 (Tue, 27 Apr 2010) | 1 line
          
          doc/kleopatra: "LDAB" -> "&ldap;"
        ........
      ................
        r1144128 | tmcguire | 2010-06-29 14:16:46 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119588 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119588 | mutz | 2010-04-27 14:54:28 +0200 (Tue, 27 Apr 2010) | 1 line
          
          doc/kleopatra: update version, date, and keywords
        ........
      ................
        r1144129 | tmcguire | 2010-06-29 14:17:46 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119628 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119628 | mutz | 2010-04-27 16:01:42 +0200 (Tue, 27 Apr 2010) | 1 line
          
          doc/kleopatra: Update File menu reference section.
        ........
      ................
        r1144130 | tmcguire | 2010-06-29 14:18:46 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119978 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119978 | mutz | 2010-04-28 07:21:42 +0200 (Wed, 28 Apr 2010) | 1 line
          
          doc/kleopatra: Update View menu reference section.
        ........
      ................
        r1144133 | tmcguire | 2010-06-29 14:19:49 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119979 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119979 | mutz | 2010-04-28 07:21:45 +0200 (Wed, 28 Apr 2010) | 1 line
          
          doc/kleopatra: Update Certificates menu reference section.
        ........
      ................
        r1144134 | tmcguire | 2010-06-29 14:20:49 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120031 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120031 | mutz | 2010-04-28 09:51:31 +0200 (Wed, 28 Apr 2010) | 1 line
          
          doc/kleopatra: fix typo
        ........
      ................
        r1144135 | tmcguire | 2010-06-29 14:21:53 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120064 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120064 | mutz | 2010-04-28 11:36:55 +0200 (Wed, 28 Apr 2010) | 1 line
          
          doc/kleopatra: move warning around, fix typo
        ........
      ................
        r1144137 | tmcguire | 2010-06-29 14:22:54 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120578 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120578 | mutz | 2010-04-29 12:35:29 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: comment out "keybox management" section, which is hopelessly outdated
        ........
      ................
        r1144138 | mutz | 2010-06-29 14:23:09 +0200 (Tue, 29 Jun 2010) | 1 line
        
        messagefactorytest.cpp: fix expected value for testCreateResend()
      ................
        r1144141 | tmcguire | 2010-06-29 14:28:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120579 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120579 | mutz | 2010-04-29 12:35:32 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: correct location of gpgconf-driven backend configuration dialog
        ........
      ................
        r1144143 | tmcguire | 2010-06-29 14:29:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120580 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120580 | mutz | 2010-04-29 12:35:34 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: Update Tools menu reference section.
        ........
      ................
        r1144144 | tmcguire | 2010-06-29 14:30:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120581 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120581 | mutz | 2010-04-29 12:35:36 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: Update Settings menu reference section.
        ........
      ................
        r1144145 | tmcguire | 2010-06-29 14:31:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120637 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120637 | mutz | 2010-04-29 16:19:06 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: "CA" ->
        ........
      ................
        r1144146 | tmcguire | 2010-06-29 14:32:47 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1120638 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120638 | mutz | 2010-04-29 16:19:07 +0200 (Thu, 29 Apr 2010) | 3 lines
          
          doc/kleopatra: add dummy chapters for some Config Dialog pages
          
          This is so we can use them as <xref/> targets already.
        ........
      ................
        r1144147 | tmcguire | 2010-06-29 14:33:48 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1120639 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1120639 | mutz | 2010-04-29 16:19:08 +0200 (Thu, 29 Apr 2010) | 1 line
          
          doc/kleopatra: Update Settings / Directory Services reference section.
        ........
      ................
        r1144148 | tmcguire | 2010-06-29 14:34:47 +0200 (Tue, 29 Jun 2010) | 13 lines
        
        SVN_MERGE:
        Merged revisions 1121029 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121029 | mutz | 2010-04-30 09:56:59 +0200 (Fri, 30 Apr 2010) | 4 lines
          
          doc/kleopatra: remove leading and trailing whitespace in <title>
          
          Either DocBook itself or the KDE stylesheet is buggy and doesn't remove it
          before using the content between quotes in an <xref/>.
        ........
      ................
        r1144149 | tmcguire | 2010-06-29 14:35:47 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1121032 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121032 | mutz | 2010-04-30 09:57:06 +0200 (Fri, 30 Apr 2010) | 1 line
          
          doc/kleopatra: Update Settings / Appearance reference section.
        ........
      ................
        r1144151 | tmcguire | 2010-06-29 14:36:48 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122089 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122089 | mutz | 2010-05-03 09:26:28 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: remove cut'n'paste rubbish
        ........
      ................
        r1144152 | tmcguire | 2010-06-29 14:37:48 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122091 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122091 | mutz | 2010-05-03 09:26:34 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: Add Settings / Crypto Operations reference section
        ........
      ................
        r1144153 | tmcguire | 2010-06-29 14:38:48 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122092 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122092 | mutz | 2010-05-03 09:26:38 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: adjust emacs local variables to what's actually used
        ........
      ................
        r1144155 | tmcguire | 2010-06-29 14:39:53 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122093 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122093 | mutz | 2010-05-03 09:26:41 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: "CRL" -> "&crl;"
        ........
      ................
        r1144157 | tmcguire | 2010-06-29 14:40:57 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122094 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122094 | mutz | 2010-05-03 09:26:44 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: add missing id
        ........
      ................
        r1144158 | tmcguire | 2010-06-29 14:41:58 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122095 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122095 | mutz | 2010-05-03 09:26:47 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: Add Settings / S/MIME Validation reference section
        ........
      ................
        r1144159 | tmcguire | 2010-06-29 14:42:58 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122096 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122096 | mutz | 2010-05-03 09:26:50 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: grammar, and link to now-existing "S/MIME Validation"-Entry.
        ........
      ................
        r1144162 | tmcguire | 2010-06-29 14:43:59 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122377 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122377 | mutz | 2010-05-03 20:29:34 +0200 (Mon, 03 May 2010) | 1 line
          
          doc/kleopatra: Paint out Settings / GnuPG System reference section
        ........
      ................
        r1144168 | tmcguire | 2010-06-29 14:47:31 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1119589 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1119589 | mutz | 2010-04-27 14:54:31 +0200 (Tue, 27 Apr 2010) | 1 line
          
          kleopatra/input.cpp: compile on platforms that #define stdin
        ........
      ................
        r1144170 | tmcguire | 2010-06-29 14:49:00 +0200 (Tue, 29 Jun 2010) | 16 lines
        
        SVN_MERGE:
        Merged revisions 1121030 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121030 | mutz | 2010-04-30 09:57:01 +0200 (Fri, 30 Apr 2010) | 7 lines
          
          AppearanceConfigWidget: reorganize
          
          1. Rename tab General to Tooltips
          2. Replace groupbox "Tooltips" with a label.
          3. Show certificate details -> Show technical details
          4. Rename tab Certificate Filters to Certificate Categories
             (to match handbook terminology).
        ........
      ................
        r1144172 | cgiboudeaux | 2010-06-29 14:53:28 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Fix includes.
      ................
        r1144173 | lfranchi | 2010-06-29 14:59:52 +0200 (Tue, 29 Jun 2010) | 2 lines
        
        Use preferred charset list when creating OTP text content.
      ................
        r1144175 | lfranchi | 2010-06-29 15:01:41 +0200 (Tue, 29 Jun 2010) | 2 lines
        
        Update expected value to include From: field
      ................
        r1144178 | smartins | 2010-06-29 15:10:55 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1144177 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1144177 | smartins | 2010-06-29 14:08:30 +0100 (Tue, 29 Jun 2010) | 4 lines
          
          When adding many incidences, don't ask which calendar to put it in, for each incidence.
          
          MERGE none, already in trunk
        ........
      ................
        r1144184 | tmcguire | 2010-06-29 15:21:22 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1121031 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121031 | mutz | 2010-04-30 09:57:03 +0200 (Fri, 30 Apr 2010) | 3 lines
          
          KeyListController: shuffle around tooltip information sets' contents
          
          This is hopefully more balanced and logical.
        ........
      ................
        r1144186 | tmcguire | 2010-06-29 15:22:25 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1121046 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121046 | mutz | 2010-04-30 10:37:50 +0200 (Fri, 30 Apr 2010) | 1 line
          
          KeyTreeView: just in case, check for NULL models when switching hierarchial view on/off
        ........
      ................
        r1144187 | tmcguire | 2010-06-29 15:23:24 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1121048 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1121048 | mutz | 2010-04-30 10:37:53 +0200 (Fri, 30 Apr 2010) | 3 lines
          
          Fix flat mode not working.
          
          kolab/issue4327 (gpg4win).
        ........
      ................
        r1144190 | tmcguire | 2010-06-29 15:25:42 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122088 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122088 | mutz | 2010-05-03 09:26:23 +0200 (Mon, 03 May 2010) | 1 line
          
          CryptoOperationsConfigWidget: rename Checksum Operations tab to File Operations
        ........
      ................
        r1144191 | tmcguire | 2010-06-29 15:27:14 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122090 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122090 | mutz | 2010-05-03 09:26:31 +0200 (Mon, 03 May 2010) | 1 line
          
          CryptoOperationsConfigWidget: better wording of checksumDefinitionCB's what's this help text
        ........
      ................
        r1144192 | tmcguire | 2010-06-29 15:28:28 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1122097 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1122097 | mutz | 2010-05-03 09:26:53 +0200 (Mon, 03 May 2010) | 1 line
          
          SMimeValidationConfigurationWidget: small what's this fixes, adding one more what's this text
        ........
      ................
        r1144193 | tmcguire | 2010-06-29 15:30:10 +0200 (Tue, 29 Jun 2010) | 13 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1137881 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1137881 | winterz | 2010-06-14 16:50:31 +0200 (Mon, 14 Jun 2010) | 5 lines
          
          include <cstdio> for the FILE definition.
          http://reviewboard.kde.org/r/4294
          CCMAIL: avg@icyb.net.ua
          MERGE: trunk,4.4,3.5?
        ........
      ................
        r1144196 | tmcguire | 2010-06-29 15:31:57 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1139103 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1139103 | eschuetze | 2010-06-17 12:31:17 +0200 (Thu, 17 Jun 2010) | 2 lines
          
          Changed icon.
        ........
      ................
        r1144202 | tmcguire | 2010-06-29 15:38:01 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1139173 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1139173 | tmcguire | 2010-06-17 16:49:27 +0200 (Thu, 17 Jun 2010) | 4 lines
          
          Change the english version of there strings as well.
          
          CCMAIL: emanuel@intevation.de
        ........
      ................
        r1144203 | tmcguire | 2010-06-29 15:39:28 +0200 (Tue, 29 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1141638 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1141638 | mutz | 2010-06-23 08:19:36 +0200 (Wed, 23 Jun 2010) | 3 lines
          
          Selectively revert commit 1139173
          
          There's no such thing as "public certificate" or "secret certificate".
        ........
      ................
        r1144204 | tmcguire | 2010-06-29 15:44:15 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1141636 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1141636 | mutz | 2010-06-23 08:07:38 +0200 (Wed, 23 Jun 2010) | 1 line
          
          kleopatra_signencryptfiles.desktop: use "Sign & Encrypt", not "Encrypt & Sign", for consistency
        ........
      ................
        r1144205 | tmcguire | 2010-06-29 15:45:39 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1141637 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1141637 | mutz | 2010-06-23 08:07:47 +0200 (Wed, 23 Jun 2010) | 1 line
          
          Actually add the --sign-encrypt command line switch to Kleopatra that we use in the Konqueror "plugins"
        ........
      ................
        r1144207 | tmcguire | 2010-06-29 15:46:54 +0200 (Tue, 29 Jun 2010) | 10 lines
        
        SVN_MERGE:
        Merged revisions 1142558 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1142558 | mutz | 2010-06-25 09:12:39 +0200 (Fri, 25 Jun 2010) | 1 line
          
          FindAssuan2.cmake: On Windows, find the assuan v2 lib by the dllname "assuan-0" (sic!)
        ........
      ................
        r1144260 | lfranchi | 2010-06-29 16:46:16 +0200 (Tue, 29 Jun 2010) | 2 lines
        
        New smime key that is properly added to keychain. ATM it pops up a pinentry dialog even though the key is passphrase-less, and just pressing enter works.
      ................
        r1144268 | skelly | 2010-06-29 17:00:23 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Use the kdelibs version directly in trunk.
      ................
        r1144276 | skelly | 2010-06-29 17:09:29 +0200 (Tue, 29 Jun 2010) | 4 lines
        
        Revert "Use the kdelibs version directly in trunk."
        
        We rely on kdelibs 4.4 in trunk still.
        This reverts commit aee931fad97409fc5fd7c0f6b36afbd3ab86b30f.
      ................
        r1144281 | skelly | 2010-06-29 17:15:12 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Update with version from kdelibs trunk
      ................
        r1144291 | ervin | 2010-06-29 17:38:44 +0200 (Tue, 29 Jun 2010) | 3 lines
        
        In case of connection loss, ditch the main session pointer before the
        reconnect. It's invalid now anyway.
      ................
        r1144304 | tmcguire | 2010-06-29 17:58:37 +0200 (Tue, 29 Jun 2010) | 8 lines
        
        Add context to the "&Add" string.
        
        This is necessary because "&Add" is in multiple catalogs,
        with different meanings. For example, in German, it is
        sometimes translated as "Neu" and sometimes as "Hinzufügen".
        
        Part of kolab/issue4264
        SVN_MERGE
      ................
        r1144305 | tmcguire | 2010-06-29 18:01:15 +0200 (Tue, 29 Jun 2010) | 18 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1122624 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1122624 | tmcguire | 2010-05-04 12:54:21 +0200 (Tue, 04 May 2010) | 10 lines
          
          Add context to the "&Add" string.
          
          This is necessary because "&Add" is in multiple catalogs,
          with different meanings. For example, in German, it is
          sometimes translated as "Neu" and sometimes as "Hinzufügen".
          
          MERGE: trunk (but there, it is probably possible to keep the
                        string in the UI file)
          Part of kolab/issue4264
        ........
      ................
        r1144366 | tmcguire | 2010-06-29 20:50:09 +0200 (Tue, 29 Jun 2010) | 3 lines
        
        Remove email support in the groupwise wizard.
        
        It didn't work anyway, is it modified the old KMail config file.
      ................
        r1144367 | tmcguire | 2010-06-29 20:50:15 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Port to new identity API.
      ................
        r1144368 | tmcguire | 2010-06-29 20:50:17 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Add an editor for email aliases to the identity dialog.
      ................
        r1144370 | tmcguire | 2010-06-29 20:53:24 +0200 (Tue, 29 Jun 2010) | 23 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1122656,1122659 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1122656 | mutz | 2010-05-04 14:25:06 +0200 (Tue, 04 May 2010) | 8 lines
          
          libkpimidentities: add email aliases to Identity; use them in KMail, KOrg, wizards/
          
          With this patch, KMail allows an identity to have arbitrarily many email 
          aliases. Aliases are email addresses that are considered representing the 
          identity, but that will not be used for outgoing messages.
          
          The immediate problem this is fixing is that hitting 'A' on a message with 
          an old (=alias) address includes that (old/alias) address in the list of To's.
        ........
          r1122659 | mutz | 2010-05-04 14:36:57 +0200 (Tue, 04 May 2010) | 3 lines
          
          IdentityDialog: use a SimpleStringListEditor instead of QTextEdit
          
          Thanks to Thomas for the suggestion.
        ........
      ................
        r1144386 | tmcguire | 2010-06-29 21:28:02 +0200 (Tue, 29 Jun 2010) | 4 lines
        
        Fix inverted logic in initFromMessage().
        
        Read the identity from the original message, not from the new one.
        Now email aliases finally work correctly.
      ................
        r1144401 | cgiboudeaux | 2010-06-29 22:48:15 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Both kdepim and kdepim-runtime require kdepimlibs 4.5.60 (changes in kpimidentities)
      ................
        r1144411 | tmcguire | 2010-06-29 23:14:20 +0200 (Tue, 29 Jun 2010) | 1 line
        
        Compile
      ................
        r1144451 | lfranchi | 2010-06-30 01:09:37 +0200 (Wed, 30 Jun 2010) | 4 lines
        
        Fix endless loop on parsing encrypted messages with embedded messages.
        
        BUG: 236737
      ................
        r1144531 | scripty | 2010-06-30 09:23:21 +0200 (Wed, 30 Jun 2010) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1144540 | cgiboudeaux | 2010-06-30 10:20:20 +0200 (Wed, 30 Jun 2010) | 1 line
        
        Fix a build error reported on CDash.
      ................
        r1144618 | mikemcquaid | 2010-06-30 13:38:47 +0200 (Wed, 30 Jun 2010) | 2 lines
        
        Got married, changed my name. Update it so people can contact me.
      ................
        r1144640 | skelly | 2010-06-30 14:39:51 +0200 (Wed, 30 Jun 2010) | 1 line
        
        Build.
      ................
        r1144674 | lfranchi | 2010-06-30 16:18:18 +0200 (Wed, 30 Jun 2010) | 2 lines
        
        Grey out composer window as soon as Send is pressed, not after emails are resolved.
      ................
        r1144684 | yurchor | 2010-06-30 16:30:07 +0200 (Wed, 30 Jun 2010) | 1 line
        
        typo fix
      ................
        r1144687 | cgiboudeaux | 2010-06-30 16:36:46 +0200 (Wed, 30 Jun 2010) | 3 lines
        
        Move or copy the icons used in messagelist.
        CCBUG: 243256
      ................
        r1144690 | cgiboudeaux | 2010-06-30 16:40:43 +0200 (Wed, 30 Jun 2010) | 1 line
        
        Cleanup
      ................
        r1144717 | skelly | 2010-06-30 17:33:29 +0200 (Wed, 30 Jun 2010) | 1 line
        
        Implement headerData.
      ................
        r1144722 | vkrause | 2010-06-30 17:47:33 +0200 (Wed, 30 Jun 2010) | 2 lines
        
        compile
      ................
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1146266
      1a84b2f6
  8. 30 Jun, 2010 1 commit
  9. 29 Jun, 2010 1 commit
  10. 15 May, 2010 1 commit
  11. 06 May, 2010 1 commit
  12. 22 Apr, 2010 2 commits
  13. 06 Mar, 2010 1 commit
  14. 17 Feb, 2010 1 commit
  15. 05 Feb, 2010 1 commit
  16. 07 Jan, 2010 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 0fedbcfe
      Volker Krause authored
      Merged revisions 1070566,1070679,1070773,1070875 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1070566 | winterz | 2010-01-06 02:49:41 +0100 (Wed, 06 Jan 2010) | 18 lines
        
        Blocked revisions 1070565 via svnmerge
        
        ................
          r1070565 | winterz | 2010-01-05 20:48:06 -0500 (Tue, 05 Jan 2010) | 12 lines
          
          Merged revisions 1070559 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1070559 | winterz | 2010-01-05 20:15:55 -0500 (Tue, 05 Jan 2010) | 5 lines
            
            don't print a trailing ',' (comma) if an incidence's location field is empty.
            when printing day events.
            
            MERGE: e4 (already in trunk)
          ........
        ................
      ................
        r1070679 | scripty | 2010-01-06 14:03:59 +0100 (Wed, 06 Jan 2010) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1070773 | cgiboudeaux | 2010-01-06 19:04:46 +0100 (Wed, 06 Jan 2010) | 1 line
        
        Don't install these headers anymore.
      ................
        r1070875 | cgiboudeaux | 2010-01-07 00:42:09 +0100 (Thu, 07 Jan 2010) | 3 lines
        
        More headers that shouldn't be installed
        MERGE: 4.4 (with r1070773)
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1071011
      0fedbcfe
  17. 06 Jan, 2010 2 commits
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) · 0f8dbf70
      Script Kiddy authored
      svn path=/trunk/KDE/kdepim/runtime/; revision=1070679
      0f8dbf70
    • Volker Krause's avatar
      SVN_MERGE · 92f282b3
      Volker Krause authored
      Merged revisions 1070326,1070408 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1070326 | scripty | 2010-01-05 11:45:18 +0100 (Tue, 05 Jan 2010) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1070408 | boiko | 2010-01-05 16:28:39 +0100 (Tue, 05 Jan 2010) | 5 lines
        
        Draw the description aligned at top so that if it has more than two lines the 
        additional lines are not drawn
        
        BUG: 218103
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1070630
      92f282b3
  18. 05 Jan, 2010 2 commits
    • Volker Krause's avatar
      SVN_MERGE · 249aea2c
      Volker Krause authored
      Merged revisions 1067418,1067507,1067528,1067701,1067840,1068120,1068176,1068311,1068594,1068742,1068747,1069016,1069028-1069029,1069033,1069207,1069386,1069513,1069679,1069684,1069958,1069987-1069988,1070004,1070028,1070061,1070073 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1067418 | tokoe | 2009-12-29 16:36:20 +0100 (Tue, 29 Dec 2009) | 2 lines
        
        Use the brand new ldap icon
      ................
        r1067507 | tmcguire | 2009-12-29 19:10:16 +0100 (Tue, 29 Dec 2009) | 115 lines
        
        Block cyclic merges, blocks, release stuff.
        SVN_MERGE
        SVN_SILENT
        Blocked revisions 1062964,1063082,1063116,1063422,1063485,1063502,1064260,1066656 via svnmerge
        
        ................
          r1062964 | ludwigreiter | 2009-12-16 13:48:07 +0100 (Wed, 16 Dec 2009) | 2 lines
          
          Update after newslog 2009-12-04 test.
        ................
          r1063082 | winterz | 2009-12-16 23:24:13 +0100 (Wed, 16 Dec 2009) | 18 lines
          
          Merged revisions 1063007 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1063007 | tmcguire | 2009-12-16 12:34:12 -0500 (Wed, 16 Dec 2009) | 12 lines
            
            kolab/issue3996
            MERGE: e4
            SVN_MERGE
            
            Crossport r1028779 by tmcguire from trunk to the enterprise35 branch:
            
            Use KMime to find the subject, so we can deal properly with non-ascii chars
            or folded headers.
            
            Please review, is the ' ' to '_' conversion still required? I left that out...
          ........
        ................
          r1063116 | winterz | 2009-12-17 01:27:39 +0100 (Thu, 17 Dec 2009) | 14 lines
          
          Blocked revisions 1063115 via svnmerge
          
          ........
            r1063115 | winterz | 2009-12-16 19:25:34 -0500 (Wed, 16 Dec 2009) | 8 lines
            
            when a new attendee is added to an event, make sure to increment
            the revision number of the incidence passed to the existing
            attendees is properly incremented.
            
            Found while working on kolab/issue3988
            
            MERGE: none (already in e4 and trunk)
          ........
        ................
          r1063422 | winterz | 2009-12-18 15:21:16 +0100 (Fri, 18 Dec 2009) | 18 lines
          
          Blocked revisions 1063418,1063421 via svnmerge
          
          ........
            r1063418 | winterz | 2009-12-18 09:17:27 -0500 (Fri, 18 Dec 2009) | 7 lines
            
            in prettifyQuotaError, don't assert if the folder for the specified job is 0.
            simply return instead.  this is how it's done in e4 and trunk.
            
            kolab/issue4003
            MERGE: none
          ........
            r1063421 | winterz | 2009-12-18 09:20:02 -0500 (Fri, 18 Dec 2009) | 4 lines
            
            in prettifiyQuotaError, return _error instead of error if folder is 0
            
            MERGE: none
          ........
        ................
          r1063485 | tmcguire | 2009-12-18 18:05:35 +0100 (Fri, 18 Dec 2009) | 1 line
          
          Update Newslog.txt
        ................
          r1063502 | tmcguire | 2009-12-18 18:39:42 +0100 (Fri, 18 Dec 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1064260 | winterz | 2009-12-20 14:15:48 +0100 (Sun, 20 Dec 2009) | 32 lines
          
          Blocked revisions 1061391,1062472,1063456,1063482,1063501 via svnmerge
          
          ........
            r1061391 | tmcguire | 2009-12-11 11:10:12 -0500 (Fri, 11 Dec 2009) | 1 line
            
            SVN_SILENT just a test commit for svnmerge
          ........
            r1062472 | winterz | 2009-12-14 16:20:32 -0500 (Mon, 14 Dec 2009) | 9 lines
            
            Put the Todo View Group settings below the Month View Group settings
            to save horizontal space, at the expense of vertical space.
            This does look better, but I hope it isn't too tall.
            I measure about 700px high with my font setting.
            
            kolab/issue3994
            MERGE: none 
          ........
            r1063456 | tmcguire | 2009-12-18 10:54:38 -0500 (Fri, 18 Dec 2009) | 4 lines
            
            Add missing endl's.
            SVN_SILENT
            MERGE: none
          ........
            r1063482 | tmcguire | 2009-12-18 11:54:07 -0500 (Fri, 18 Dec 2009) | 2 lines
            
            Update Newslog.txt
          ........
            r1063501 | tmcguire | 2009-12-18 12:39:39 -0500 (Fri, 18 Dec 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1066656 | tmcguire | 2009-12-27 17:34:16 +0100 (Sun, 27 Dec 2009) | 4 lines
          
          Port the async crash test from trunk to e4.
          
          MERGE: none
        ................
      ................
        r1067528 | tmcguire | 2009-12-29 19:44:22 +0100 (Tue, 29 Dec 2009) | 26 lines
        
        Tobias, how does the contact group editor in the new KAddressbook handle completion
        of members, does it offer to complete to other contact group? Or does it disallow this?
        Or are recursive contact groups allowed now?
        
        CCMAIL: tokoe@kde.org
        --
        Block this commit, KAddressbook has a completely new contact group editor now.
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 1065582 via svnmerge
        
        ................
          r1065582 | winterz | 2009-12-23 20:10:32 +0100 (Wed, 23 Dec 2009) | 11 lines
          
          Merged revisions 1065538 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1065538 | tmcguire | 2009-12-23 10:47:35 -0500 (Wed, 23 Dec 2009) | 4 lines
            
            Don't allow to add distribution lists to distribution lists, that doesn't work.
            
            kolab/issue3929
          ........
        ................
      ................
        r1067701 | scripty | 2009-12-30 12:43:45 +0100 (Wed, 30 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1067840 | skelly | 2009-12-30 19:20:04 +0100 (Wed, 30 Dec 2009) | 1 line
        
        Add the other missing explicits.
      ................
        r1068120 | scripty | 2009-12-31 12:37:33 +0100 (Thu, 31 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1068176 | ltoscano | 2009-12-31 14:47:39 +0100 (Thu, 31 Dec 2009) | 4 lines
        
        Typo fix.
        
        CCMAIL: kde-i18n-doc@kde.org
      ................
        r1068311 | rdieter | 2009-12-31 21:02:01 +0100 (Thu, 31 Dec 2009) | 2 lines
        
        add awol Type= key
      ................
        r1068594 | otrichet | 2010-01-01 18:03:00 +0100 (Fri, 01 Jan 2010) | 1 line
        
        Correct krazy exclusion
      ................
        r1068742 | tmcguire | 2010-01-01 23:54:05 +0100 (Fri, 01 Jan 2010) | 17 lines
        
        Don't allow some actions like select next unread message when the model
        hasn't been loaded yet.
        
        This fixes the source of the most crashes for me, which happen when quickly
        pressing + after selecting a folder (and the folder is still loading)
        
        The problem is that the model is in 'disconnected UI' mode, which means
        mModelForItemFunctions is 0, and therefore index() returns an invalid index,
        leading to an assert in e.g. messageItemAfter().
        
        Szymon, are you still alive? :)
        If so, can you tell us if the model is supposed to be disconnected at this
        point and if this is the right fix?
        I have the feeling it is a regression, but I'm not sure.
        
        CCMAIL: pragma@kvirc.net
      ................
        r1068747 | tmcguire | 2010-01-01 23:58:32 +0100 (Fri, 01 Jan 2010) | 3 lines
        
        Revert temp. porting code, KMail can switch the theme even without the
        header shown, in the View menu.
      ................
        r1069016 | krake | 2010-01-02 15:46:47 +0100 (Sat, 02 Jan 2010) | 2 lines
        
        Adapt usage of mimetype visitor after final move in Revision 1069015
      ................
        r1069028 | cgiboudeaux | 2010-01-02 16:29:56 +0100 (Sat, 02 Jan 2010) | 1 line
        
        look for kdelibs only if this is directory is built standalone (is this really needed, anyway?)
      ................
        r1069029 | cgiboudeaux | 2010-01-02 16:30:53 +0100 (Sat, 02 Jan 2010) | 1 line
        
        Remove non-existing include.
      ................
        r1069033 | cgiboudeaux | 2010-01-02 16:42:39 +0100 (Sat, 02 Jan 2010) | 1 line
        
        Fix link.
      ................
        r1069207 | tstaerk | 2010-01-02 23:59:35 +0100 (Sat, 02 Jan 2010) | 7 lines
        
        Show a description next to the toolbar items. That is especially important if
        you have an internet table, i.e. a computer without a mouse but with a
        touchscreen.
        
        BUGS:182312
      ................
        r1069386 | tstaerk | 2010-01-03 12:06:56 +0100 (Sun, 03 Jan 2010) | 1 line
        
        Act on close. This is a game of inches :(
      ................
        r1069513 | fthieme | 2010-01-03 16:52:03 +0100 (Sun, 03 Jan 2010) | 1 line
        
        changed deprecated function call
      ................
        r1069679 | tstaerk | 2010-01-04 04:04:08 +0100 (Mon, 04 Jan 2010) | 1 line
        
        I could not sleep.
      ................
        r1069684 | tstaerk | 2010-01-04 05:38:37 +0100 (Mon, 04 Jan 2010) | 1 line
        
        Do not cover the ksearchtreewidgetlineedit.
      ................
        r1069958 | vkrause | 2010-01-04 15:43:33 +0100 (Mon, 04 Jan 2010) | 13 lines
        
        SVN_MERGE
        
        i18n changes excluded from the merge
        
        Merged revisions 1065241 via svnmerge from 
        https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepim
        
        ........
          r1065241 | tilladam | 2009-12-22 21:08:17 +0100 (Tue, 22 Dec 2009) | 1 line
          
          The strigi backend we need was renamed, follow the name change.
        ........
      ................
        r1069987 | cgiboudeaux | 2010-01-04 17:50:33 +0100 (Mon, 04 Jan 2010) | 1 line
        
        prepare for RC1
      ................
        r1069988 | tstaerk | 2010-01-04 17:53:00 +0100 (Mon, 04 Jan 2010) | 1 line
        
        Fixing typo
      ................
        r1070004 | tokoe | 2010-01-04 18:22:49 +0100 (Mon, 04 Jan 2010) | 2 lines
        
        Make editing/deleting of contacts work with OX/6
      ................
        r1070028 | tstaerk | 2010-01-04 19:49:56 +0100 (Mon, 04 Jan 2010) | 1 line
        
        Will not be included in 4.4, is a incubator for the next release.
      ................
        r1070061 | tstaerk | 2010-01-04 20:55:12 +0100 (Mon, 04 Jan 2010) | 1 line
        
        Set window title.
      ................
        r1070073 | tstaerk | 2010-01-04 21:10:41 +0100 (Mon, 04 Jan 2010) | 1 line
        
        code cleanup
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1070391
      249aea2c
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) · 09db1606
      Script Kiddy authored
      svn path=/trunk/KDE/kdepim/runtime/; revision=1070326
      09db1606
  19. 31 Dec, 2009 1 commit
  20. 18 Dec, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 233e876f
      Volker Krause authored
      Merged revisions 1062618,1062981,1062989,1063097,1063174,1063192,1063196 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1062618 | cgiboudeaux | 2009-12-15 12:15:52 +0100 (Tue, 15 Dec 2009) | 14 lines
        
        Add a new option for KDE 4.4: KDEPIM_BUILD_NEPOMUK_AGENTS. It is enabled by default.
        Having soprano and nepomuk optional in kdelibs has some nasty effects on the kdepim applications,
        particularly KAdressbook which looses some important features.
        
        So, if this option is not explicitly disabled when building kdepim and kdepim-runtime, CMake will require:
        * Shared Desktop Ontologies >= 0.2
        * Soprano >= 2.3.70
        * Nepomuk
        
        Please keep in mind that kdepim will require these packages in KDE SC 4.5.
        
        CCMAIL: kde-pim@kde.org
      ................
        r1062981 | tmcguire | 2009-12-16 16:19:43 +0100 (Wed, 16 Dec 2009) | 161 lines
        
        Block release stuff, blocks, empty commits, etc
        SVN_MERGE
        SVN_SILENT
        Blocked revisions 1058385-1058386,1058414,1058474,1059846,1060278,1060307,1060333,1060717,1061368,1061421,1061432,1061443,1062371,1062467,1062635 via svnmerge
        
        ................
          r1058385 | tmcguire | 2009-12-04 12:36:34 +0100 (Fri, 04 Dec 2009) | 2 lines
          
          Update Newslog.txt
        ................
          r1058386 | tmcguire | 2009-12-04 12:37:20 +0100 (Fri, 04 Dec 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1058414 | winterz | 2009-12-04 13:26:06 +0100 (Fri, 04 Dec 2009) | 12 lines
          
          Blocked revisions 1058383,1058388 via svnmerge
          
          ........
            r1058383 | tmcguire | 2009-12-04 06:31:24 -0500 (Fri, 04 Dec 2009) | 1 line
            
            Update Newslog.txt
          ........
            r1058388 | tmcguire | 2009-12-04 06:37:34 -0500 (Fri, 04 Dec 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1058474 | winterz | 2009-12-04 15:30:11 +0100 (Fri, 04 Dec 2009) | 12 lines
          
          Merged revisions 1058462 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1058462 | winterz | 2009-12-04 09:11:35 -0500 (Fri, 04 Dec 2009) | 6 lines
            
            introduce new Calendar::sortEventsForDate() that properly handles
            sorting recurring events too.
            kolab/issue3972
            MERGE: e4,4.5 (add @since 4.5)
          ........
        ................
          r1059846 | winterz | 2009-12-07 15:42:28 +0100 (Mon, 07 Dec 2009) | 8 lines
          
          Blocked revisions 1059804 via svnmerge
          
          ........
            r1059804 | ludwigreiter | 2009-12-07 06:36:56 -0500 (Mon, 07 Dec 2009) | 2 lines
            
            Update after test of 2009-12-04 part.
          ........
        ................
          r1060278 | winterz | 2009-12-08 13:59:21 +0100 (Tue, 08 Dec 2009) | 3 lines
          
          stop using Soprano and Nepomuk -- at least for now.
          Soprano is a moving target
        ................
          r1060307 | winterz | 2009-12-08 15:46:09 +0100 (Tue, 08 Dec 2009) | 10 lines
          
          Merged revisions 1060303 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1060303 | winterz | 2009-12-08 09:40:11 -0500 (Tue, 08 Dec 2009) | 3 lines
            
            put a crash guard for the Observer in updated()
            MERGE: e4 (already in trunk)
          ........
        ................
          r1060333 | winterz | 2009-12-08 16:33:44 +0100 (Tue, 08 Dec 2009) | 11 lines
          
          Merged revisions 1059927 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1059927 | winterz | 2009-12-07 12:44:27 -0500 (Mon, 07 Dec 2009) | 4 lines
            
            let the addressee know their role in the invitation
            part of the fix for kolab/issue3964
            MERGE: e4,4.5 (new i18n strings)
          ........
        ................
          r1060717 | winterz | 2009-12-09 19:39:20 +0100 (Wed, 09 Dec 2009) | 14 lines
          
          Recorded merge of revisions 1060688 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1060688 | winterz | 2009-12-09 11:29:35 -0500 (Wed, 09 Dec 2009) | 7 lines
            
            add proper support for binary vs. non-binary attachments to the Attachment class. which brings the code up to the KDE4 standards.
            
            fix incidence attachment support in KOrganizer's incidence editor.
            kolab/issue3961
            
            MERGE: e4 (maybe, I need to double-check). already in trunk
          ........
        ................
          r1061368 | tmcguire | 2009-12-11 16:18:49 +0100 (Fri, 11 Dec 2009) | 1 line
          
          Update Newslog.txt
        ................
          r1061421 | tmcguire | 2009-12-11 18:44:34 +0100 (Fri, 11 Dec 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1061432 | winterz | 2009-12-11 18:51:31 +0100 (Fri, 11 Dec 2009) | 10 lines
          
          Blocked revisions 1061419 via svnmerge
          
          ........
            r1061419 | winterz | 2009-12-11 12:44:16 -0500 (Fri, 11 Dec 2009) | 4 lines
            
            Update the Duration class to all the goodies provided by the version in trunk.
            this will allow us to do recurring alarm calculations easier.
            MERGE: none (already in e4 and trunk)
          ........
        ................
          r1061443 | winterz | 2009-12-11 19:20:00 +0100 (Fri, 11 Dec 2009) | 12 lines
          
          Blocked revisions 1061356,1061418 via svnmerge
          
          ........
            r1061356 | tmcguire | 2009-12-11 10:02:58 -0500 (Fri, 11 Dec 2009) | 1 line
            
            Update Newslog.txt
          ........
            r1061418 | tmcguire | 2009-12-11 12:43:50 -0500 (Fri, 11 Dec 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1062371 | winterz | 2009-12-14 14:59:48 +0100 (Mon, 14 Dec 2009) | 8 lines
          
          Blocked revisions 1062367 via svnmerge
          
          ........
            r1062367 | ludwigreiter | 2009-12-14 08:26:10 -0500 (Mon, 14 Dec 2009) | 2 lines
            
            Update after test of newslog 2009-12-11.
          ........
        ................
          r1062467 | winterz | 2009-12-14 22:02:27 +0100 (Mon, 14 Dec 2009) | 12 lines
          
          Merged revisions 1062463 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1062463 | winterz | 2009-12-14 15:55:32 -0500 (Mon, 14 Dec 2009) | 6 lines
            
            Print the recipient's initial, preset status if not the default status.
            part of kolab/issue3964
            
            MERGE: e4,4.5 (new i18n strings)
          ........
        ................
          r1062635 | tmcguire | 2009-12-15 13:18:02 +0100 (Tue, 15 Dec 2009) | 1 line
          
          SVN_SILENT add issue 3916
        ................
      ................
        r1062989 | tmcguire | 2009-12-16 16:46:23 +0100 (Wed, 16 Dec 2009) | 19 lines
        
        SVN_MERGE
        SVN_SILENT
        Recorded merge of revisions 1061324 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1061324 | tmcguire | 2009-12-11 14:38:37 +0100 (Fri, 11 Dec 2009) | 10 lines
          
          SVN_MERGE
          Merged revisions 1057006 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1057006 | tmcguire | 2009-12-01 11:47:40 +0100 (Tue, 01 Dec 2009) | 2 lines
            
            Fiddle around with newlines to statisfy kolab/issue3928
          ........
        ................
      ................
        r1063097 | winterz | 2009-12-16 23:50:10 +0100 (Wed, 16 Dec 2009) | 17 lines
        
        Blocked revisions 1063092 via svnmerge
        
        ................
          r1063092 | winterz | 2009-12-16 17:44:02 -0500 (Wed, 16 Dec 2009) | 11 lines
          
          Merged revisions 1063017 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1063017 | tmcguire | 2009-12-16 13:18:37 -0500 (Wed, 16 Dec 2009) | 4 lines
            
            Change the import strings to clarify the differnce.
            kolab/issue3973
            MERGE: e4, 4.5
          ........
        ................
      ................
        r1063174 | scripty | 2009-12-17 11:21:58 +0100 (Thu, 17 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1063192 | lueck | 2009-12-17 12:08:28 +0100 (Thu, 17 Dec 2009) | 2 lines
        
        open documentation from configuration dialog pages
        CCMAIL:147070
      ................
        r1063196 | lueck | 2009-12-17 12:23:38 +0100 (Thu, 17 Dec 2009) | 2 lines
        
        open korganizer documentation from configuration dialog pages
        CCBUG:147070
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1063527
      233e876f
  21. 17 Dec, 2009 1 commit
  22. 15 Dec, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 6ea53bfd
      Volker Krause authored
      Merged revisions 1061287,1061289-1061290,1061294,1061299-1061301,1061344,1061354,1061369,1061374,1061383,1061455-1061458,1061460,1061463-1061464,1061467,1061471,1061473,1061480,1061516,1061635,1061724,1061729,1061732-1061733,1061910,1062015,1062065,1062071,1062097,1062129 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1061287 | cgiboudeaux | 2009-12-11 11:46:54 +0100 (Fri, 11 Dec 2009) | 5 lines
        
        Move kpilot to tags/unmaintained/4
        
        ACKed by Bertjan
      ........
        r1061289 | cgiboudeaux | 2009-12-11 11:49:56 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Kpilot moved to unmaintained
      ........
        r1061290 | cgiboudeaux | 2009-12-11 11:50:40 +0100 (Fri, 11 Dec 2009) | 1 line
        
        cleanup
      ........
        r1061294 | cgiboudeaux | 2009-12-11 12:28:27 +0100 (Fri, 11 Dec 2009) | 8 lines
        
        Move Kitchensync to playground/pim
        
        ACKed by Tobias.
        
        Albert, can you move the translations please ?
        CCMAIL: tsdgeos@terra.es
      ........
        r1061299 | cgiboudeaux | 2009-12-11 12:38:16 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Move the kpilot doc to its new location.
      ........
        r1061300 | cgiboudeaux | 2009-12-11 12:38:57 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Remove kpilot
      ........
        r1061301 | cgiboudeaux | 2009-12-11 12:40:00 +0100 (Fri, 11 Dec 2009) | 2 lines
        
        cleanup
      ........
        r1061344 | nlecureuil | 2009-12-11 15:36:05 +0100 (Fri, 11 Dec 2009) | 4 lines
        
        Fix Knotes when used inside Kontact
        BUG:218002
        Reviewed: http://reviewboard.kde.org/r/2356/
      ........
        r1061354 | cgiboudeaux | 2009-12-11 16:00:27 +0100 (Fri, 11 Dec 2009) | 3 lines
        
        Move tvanytime to playground/pim
        ACKed by Will.
      ........
        r1061369 | tmcguire | 2009-12-11 16:22:16 +0100 (Fri, 11 Dec 2009) | 2 lines
        
        Remove duplicated implementation of getMsgBase() for Windows.
      ........
        r1061374 | cgiboudeaux | 2009-12-11 16:26:34 +0100 (Fri, 11 Dec 2009) | 1 line
        
        shareddesktopontologies is required if Nepomuk is found and not disabled.
      ........
        r1061383 | cgiboudeaux | 2009-12-11 16:49:49 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Remove the local copy of these ontologies.
      ........
        r1061455 | cgiboudeaux | 2009-12-11 20:21:45 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Require sharedDesktopOntologies in kdepim too.
      ........
        r1061456 | cgiboudeaux | 2009-12-11 20:23:21 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Only use sharedDesktopOntologies files.
      ........
        r1061457 | cgiboudeaux | 2009-12-11 20:24:09 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Bye bye *.rdfs
      ........
        r1061458 | cgiboudeaux | 2009-12-11 20:30:51 +0100 (Fri, 11 Dec 2009) | 1 line
        
        akonadi was renamed.
      ........
        r1061460 | cgiboudeaux | 2009-12-11 20:34:06 +0100 (Fri, 11 Dec 2009) | 1 line
        
        No need to include this directory twice.
      ........
        r1061463 | cgiboudeaux | 2009-12-11 20:47:36 +0100 (Fri, 11 Dec 2009) | 1 line
        
        akonadi -> runtime
      ........
        r1061464 | cgiboudeaux | 2009-12-11 20:53:11 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Comment akonalendar. kcalmodel.h doesn't seem to exist in trunk.
      ........
        r1061467 | cgiboudeaux | 2009-12-11 20:58:55 +0100 (Fri, 11 Dec 2009) | 1 line
        
        -Wmissing-include-dirs
      ........
        r1061471 | cgiboudeaux | 2009-12-11 21:12:04 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Comment for now.
      ........
        r1061473 | cgiboudeaux | 2009-12-11 21:15:25 +0100 (Fri, 11 Dec 2009) | 1 line
        
        SVN_SILENT Disambiguate the macro_log_message.
      ........
        r1061480 | cgiboudeaux | 2009-12-11 21:39:51 +0100 (Fri, 11 Dec 2009) | 1 line
        
        Comment for the moment.
      ........
        r1061516 | cgiboudeaux | 2009-12-12 00:16:05 +0100 (Sat, 12 Dec 2009) | 1 line
        
        Fix the nepomuk_email_feeder compilation
      ........
        r1061635 | mlaurent | 2009-12-12 16:10:19 +0100 (Sat, 12 Dec 2009) | 2 lines
        
        add missing i18n
      ........
        r1061724 | reitelbach | 2009-12-12 21:23:33 +0100 (Sat, 12 Dec 2009) | 4 lines
        
        Typo fix --contact
        
        CCMAIL:kde-i18n-doc@kde.org
      ........
        r1061729 | cgiboudeaux | 2009-12-12 21:42:19 +0100 (Sat, 12 Dec 2009) | 1 line
        
        enable akonadi, akonadiconsole and akonalendar again.
      ........
        r1061732 | cgiboudeaux | 2009-12-12 21:59:15 +0100 (Sat, 12 Dec 2009) | 1 line
        
        SVN_SILENT not necessary in this directory.
      ........
        r1061733 | cgiboudeaux | 2009-12-12 22:03:38 +0100 (Sat, 12 Dec 2009) | 1 line
        
        SVN_SILENT more unneeded files removed.
      ........
        r1061910 | scripty | 2009-12-13 11:18:41 +0100 (Sun, 13 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1062015 | segato | 2009-12-13 16:11:18 +0100 (Sun, 13 Dec 2009) | 1 line
        
        include boost dir too
      ........
        r1062065 | cgiboudeaux | 2009-12-13 18:36:17 +0100 (Sun, 13 Dec 2009) | 1 line
        
        The mailreader test app. doesn't need kdepim-runtime to build.
      ........
        r1062071 | cgiboudeaux | 2009-12-13 18:58:00 +0100 (Sun, 13 Dec 2009) | 6 lines
        
        Add a new option KDEPIM_BUILD_EXAMPLES. default = disabled.
        This way, the kdepim example apps will not be packaged.
        
        CCMAIL: kde-pim@kde.org
      ........
        r1062097 | cgiboudeaux | 2009-12-13 20:50:05 +0100 (Sun, 13 Dec 2009) | 1 line
        
        SVN_SILENT KDE4_ -> KDEPIMLIBS_
      ........
        r1062129 | uwolfer | 2009-12-13 22:35:03 +0100 (Sun, 13 Dec 2009) | 2 lines
        
        optimizegraphics: Losslessly optimized PNG and SVGZ files with "optipng -o5" and "advdef -z -4".
        Reduced disk space: 2524KB (2MB)
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/runtime/; revision=1062647
      6ea53bfd
  23. 13 Dec, 2009 1 commit
  24. 11 Dec, 2009 2 commits
  25. 10 Dec, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 5e3ea345
      Volker Krause authored
      Merged revisions 1058568,1058637,1058673,1059156,1059857,1059987,1060047,1060071,1060076,1060244,1060398-1060399,1060415,1060429,1060452,1060617,1060712,1060733-1060734,1060763-1060765 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1058568 | skelly | 2009-12-04 18:37:03 +0100 (Fri, 04 Dec 2009) | 3 lines
        
        Check in the latest kreparentingproxymodel.
        
        This implements support for rowsRemoved among other things now.
      ................
        r1058637 | tokoe | 2009-12-04 21:52:47 +0100 (Fri, 04 Dec 2009) | 2 lines
        
        SVN_SILENT krazy fixes
      ................
        r1058673 | djarvie | 2009-12-04 23:14:39 +0100 (Fri, 04 Dec 2009) | 2 lines
        
        Change date format in dialogue
      ................
        r1059156 | golnazn | 2009-12-05 23:34:43 +0100 (Sat, 05 Dec 2009) | 1 line
        
        BUG:#216909: Add support of <pre> tags in the post editor.
      ................
        r1059857 | lueck | 2009-12-07 16:00:39 +0100 (Mon, 07 Dec 2009) | 2 lines
        
        extract messages + load the catalog
        CCMAIL:kde-i18n-doc@kde.org
      ................
        r1059987 | tmcguire | 2009-12-07 21:53:36 +0100 (Mon, 07 Dec 2009) | 3 lines
        
        Protect against event loop reentrancy.
        Fixes crash on startup due to the ContactSearchJob
      ................
        r1060047 | cgiboudeaux | 2009-12-08 00:16:13 +0100 (Tue, 08 Dec 2009) | 1 line
        
        We now require Boost 1.34.0
      ................
        r1060071 | djarvie | 2009-12-08 01:43:14 +0100 (Tue, 08 Dec 2009) | 2 lines
        
        Bug 217456: fix date-only alarms triggering repeatedly at high frequency.
      ................
        r1060076 | djarvie | 2009-12-08 01:56:05 +0100 (Tue, 08 Dec 2009) | 2 lines
        
        Fix date-only alarms in akonadi resource
      ................
        r1060244 | scripty | 2009-12-08 11:53:04 +0100 (Tue, 08 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1060398 | nlecureuil | 2009-12-08 20:48:03 +0100 (Tue, 08 Dec 2009) | 3 lines
        
        Fix crash when KTimetracker is in Kontact
        BUG:217721
      ................
        r1060399 | nlecureuil | 2009-12-08 20:56:26 +0100 (Tue, 08 Dec 2009) | 5 lines
        
        Allow "new task" button to work when KTimeTracker is embeded in Kontact
        and no document already exists
        
        BUG:212725
      ................
        r1060415 | winterz | 2009-12-08 22:17:13 +0100 (Tue, 08 Dec 2009) | 21 lines
        
        Recorded merge of revisions 1060413 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1060413 | winterz | 2009-12-08 16:13:06 -0500 (Tue, 08 Dec 2009) | 14 lines
          
          Merged revisions 1060410 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1060410 | winterz | 2009-12-08 16:04:46 -0500 (Tue, 08 Dec 2009) | 7 lines
            
            merge SVN commit 1060407 by winterz from trunk:
            
            Don't assert when adding a new Journal with attendees.
            Looks like I'm adding a new string, but I'm not: I'm reusing a string from 4.3
            
            MERGE: e4 (already in trunk)
          ........
        ................
      ................
        r1060429 | djarvie | 2009-12-08 23:09:30 +0100 (Tue, 08 Dec 2009) | 1 line
        
        Remove warning
      ................
        r1060452 | pokrzywka | 2009-12-09 01:14:13 +0100 (Wed, 09 Dec 2009) | 1 line
        
        added Boost_INCLUDEDIRS to some plugins which require boost::shared_ptr indirectly
      ................
        r1060617 | scripty | 2009-12-09 12:42:13 +0100 (Wed, 09 Dec 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1060712 | winterz | 2009-12-09 19:28:34 +0100 (Wed, 09 Dec 2009) | 19 lines
        
        Blocked revisions 1060710 via svnmerge
        
        ................
          r1060710 | winterz | 2009-12-09 13:27:11 -0500 (Wed, 09 Dec 2009) | 13 lines
          
          Merged revisions 1060708 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1060708 | winterz | 2009-12-09 13:23:56 -0500 (Wed, 09 Dec 2009) | 6 lines
            
            fix my previous commit for
            "Don't assert when adding a new Journal with attendees."
            
            I put the fix in the wrong place.  This will teach me not to merge by-hand.
            MERGE: e4
          ........
        ................
      ................
        r1060733 | tokoe | 2009-12-09 20:37:58 +0100 (Wed, 09 Dec 2009) | 2 lines
        
        Abort application if Akonadi couldn't be started
      ................
        r1060734 | tokoe | 2009-12-09 20:38:29 +0100 (Wed, 09 Dec 2009) | 2 lines
        
        Abort application if Akonadi couldn't be started
      ................
        r1060763 | otrichet | 2009-12-09 21:34:19 +0100 (Wed, 09 Dec 2009) | 3 lines
        
        Use the spell checker configuration of KNode instead of the global one.
        
        BUG: 207767
      ................
        r1060764 | otrichet | 2009-12-09 21:34:26 +0100 (Wed, 09 Dec 2009) | 1 line
        
        useless code
      ................
        r1060765 | otrichet | 2009-12-09 21:34:33 +0100 (Wed, 09 Dec 2009) | 3 lines
        
        Remember if automatic spell checking is enabled or not
        
        BUG: 123720
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1061100
      5e3ea345
  26. 01 Dec, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · c62d3921
      Volker Krause authored
      Merged revisions 1056468,1056473,1056482,1056597,1056626,1056728 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1056468 | djarvie | 2009-11-30 11:15:20 +0100 (Mon, 30 Nov 2009) | 2 lines
        
        Fix parent class reference
      ................
        r1056473 | djarvie | 2009-11-30 11:25:34 +0100 (Mon, 30 Nov 2009) | 2 lines
        
        Remove redundant line
      ................
        r1056482 | djarvie | 2009-11-30 11:46:54 +0100 (Mon, 30 Nov 2009) | 2 lines
        
        Fix adherence to schema
      ................
        r1056597 | scripty | 2009-11-30 13:33:38 +0100 (Mon, 30 Nov 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1056626 | winterz | 2009-11-30 14:31:12 +0100 (Mon, 30 Nov 2009) | 17 lines
        
        Blocked revisions 1056623 via svnmerge
        SVN_SILENT:
        
        ................
          r1056623 | winterz | 2009-11-30 08:23:40 -0500 (Mon, 30 Nov 2009) | 10 lines
          
          Merged revisions 1056612 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1056612 | winterz | 2009-11-30 07:57:26 -0500 (Mon, 30 Nov 2009) | 3 lines
            
            crash guard if the mimetype for the invitation attachment is empty.
            MERGE: e4 (already in trunk)
          ........
        ................
      ................
        r1056728 | mlaurent | 2009-11-30 18:42:37 +0100 (Mon, 30 Nov 2009) | 3 lines
        
        SVN_SILENT:
        fix typo
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1056936
      c62d3921
  27. 22 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 45059b62
      Volker Krause authored
      Merged revisions 1038391,1038506,1038517,1038611,1038618,1038670,1038704,1038806,1038854,1038873,1038914 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1038391 | tokoe | 2009-10-21 10:59:02 +0200 (Wed, 21 Oct 2009) | 7 lines
        
        Remove Scalix support from KDE PIM
        
        As long as we have no server for testing available
        having this code around makes no sense.
        The next step would be to create a ScalixProxyResource
        based on the new IMAP resource for Akonadi anyway.
      ........
        r1038506 | scripty | 2009-10-21 12:08:41 +0200 (Wed, 21 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1038517 | pokrzywka | 2009-10-21 12:16:21 +0200 (Wed, 21 Oct 2009) | 1 line
        
        add missing library to the link
      ........
        r1038611 | winterz | 2009-10-21 15:56:00 +0200 (Wed, 21 Oct 2009) | 3 lines
        
        compile warnings--
        MERGE: none
      ........
        r1038618 | pokrzywka | 2009-10-21 16:08:03 +0200 (Wed, 21 Oct 2009) | 1 line
        
        grrr, #warning is gcc specific... There are better ways to set tracepoints or comments in the code :-o
      ........
        r1038670 | winterz | 2009-10-21 17:42:18 +0200 (Wed, 21 Oct 2009) | 3 lines
        
        compile warning--
        MERGE: none
      ........
        r1038704 | djarvie | 2009-10-21 19:10:15 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        Remove #warning
      ........
        r1038806 | mkoller | 2009-10-21 23:42:31 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        make sure to change the window title not only when selecting IMAP folders
      ........
        r1038854 | jpike | 2009-10-22 06:33:21 +0200 (Thu, 22 Oct 2009) | 2 lines
        
        cryptopageplugin.cpp includes kleopatra headers which require the gpgme include path to be set.
      ........
        r1038873 | vkrause | 2009-10-22 09:09:58 +0200 (Thu, 22 Oct 2009) | 2 lines
        
        fix clean build
      ........
        r1038914 | scripty | 2009-10-22 11:37:39 +0200 (Thu, 22 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1039004
      45059b62
  28. 14 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · e97ff950
      Volker Krause authored
      Merged revisions 1034717,1034746,1034750,1034758,1034772,1034782,1034827,1034838,1034840,1034982 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1034717 | scripty | 2009-10-13 12:29:53 +0200 (Tue, 13 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1034746 | tokoe | 2009-10-13 13:57:51 +0200 (Tue, 13 Oct 2009) | 6 lines
        
        Disable actions instead of hiding them fixes some
        problems with actions that can not be added to a toolbar.
        Thanks to dfaure for the patch!
        
        BUG: 207297
      ........
        r1034750 | tmcguire | 2009-10-13 14:21:36 +0200 (Tue, 13 Oct 2009) | 4 lines
        
        When creating a reply, make sure to set the correct reply context to the
        composer.
        This fixes the bug that replies to mailing lis
      ........
        r1034758 | tmcguire | 2009-10-13 14:46:27 +0200 (Tue, 13 Oct 2009) | 3 lines
        
        Don't call applyTemplate() upon the inital setMsg(), this removes an
        unnecessary template processing step.
      ........
        r1034772 | stikonas | 2009-10-13 15:38:39 +0200 (Tue, 13 Oct 2009) | 1 line
        
        i18n: Convert suffixes in spinBoxes to ki18np().
      ........
        r1034782 | ervin | 2009-10-13 16:29:25 +0200 (Tue, 13 Oct 2009) | 10 lines
        
        Handle the cache policy better, don't override it in every collection,
        only set it on the root.
        
        Allow the user to enable a disconnected mode (everything is cached all
        the time), if not enabled we only retrieve headers on listing and mail
        content one by one when accessed (cached locally only for one hour).
        
        Also allow the user to set the interval check time.
      ........
        r1034827 | winterz | 2009-10-13 18:15:55 +0200 (Tue, 13 Oct 2009) | 7 lines
        
        CamelCase headers
        cleanup unused headers and forward class declarations.
        untangle the Kontact vs. KontactInterface namespace insanity.
        MERGE: none
        
        Note: you will need to update kdepimlibs for the new KPIMUtils/KFileIO forwarding header.
      ........
        r1034838 | winterz | 2009-10-13 18:49:58 +0200 (Tue, 13 Oct 2009) | 5 lines
        
        full helptext and whatsthis for KActions
        full KUIT
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ........
        r1034840 | chehrlic | 2009-10-13 18:57:14 +0200 (Tue, 13 Oct 2009) | 1 line
        
        windows compile++
      ........
        r1034982 | vkrause | 2009-10-14 09:35:21 +0200 (Wed, 14 Oct 2009) | 2 lines
        
        don't depend on runtime
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1035141
      e97ff950
  29. 12 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 3238c3f3
      Volker Krause authored
      Merged revisions 1033276,1033284,1033290-1033297,1033299,1033326,1033332,1033340,1033376,1033438,1033489,1033595,1033690,1033723,1033732,1033736,1033749,1033794,1033828,1033871,1033880,1033892,1033905,1033915-1033916,1033926,1033930,1033937,1033942,1033945,1034062,1034070,1034077,1034083,1034085,1034087,1034090,1034092-1034093,1034095,1034097,1034104-1034108,1034110-1034111,1034268,1034274-1034275,1034285,1034311,1034323,1034325,1034336-1034337 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1033276 | tmcguire | 2009-10-09 22:40:00 +0200 (Fri, 09 Oct 2009) | 20 lines
        
        No such foldertree here.
        SYN_SILENT
        SVN_MERGE
        Blocked revisions 1032375 via svnmerge
        
        ................
          r1032375 | winterz | 2009-10-07 18:53:43 +0200 (Wed, 07 Oct 2009) | 11 lines
          
          Merged revisions 1032272 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1032272 | tmcguire | 2009-10-07 09:03:53 -0400 (Wed, 07 Oct 2009) | 4 lines
            
            warnings--
            
            I'll also use -Wno-deprecated and Wno-ignored-qualifiers to get rid of the other warnings from kdelibs.
          ........
        ................
      ................
        r1033284 | mlaurent | 2009-10-09 22:57:59 +0200 (Fri, 09 Oct 2009) | 2 lines
        
        Fix typo
      ................
        r1033290 | tmcguire | 2009-10-09 23:06:32 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1031559 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1031559 | mutz | 2009-10-05 14:53:51 +0200 (Mon, 05 Oct 2009) | 1 line
          
          AdvancedSettingsDialog: Mr. ElGamal is now written Elgamal
        ........
        SVN_MERGE
      ................
        r1033291 | tmcguire | 2009-10-09 23:07:03 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1031803 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1031803 | mutz | 2009-10-06 09:04:59 +0200 (Tue, 06 Oct 2009) | 1 line
          
          This is going to be Kleopatra 2.0.12
        ........
        SVN_MERGE
      ................
        r1033292 | tmcguire | 2009-10-09 23:07:38 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1031823 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1031823 | mutz | 2009-10-06 10:41:21 +0200 (Tue, 06 Oct 2009) | 1 line
          
          AddUserIDCommand: only enable when we have a secret key
        ........
        SVN_MERGE
      ................
        r1033293 | tmcguire | 2009-10-09 23:08:18 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1031860 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1031860 | mutz | 2009-10-06 12:35:01 +0200 (Tue, 06 Oct 2009) | 1 line
          
          AboutGpg4winData: try to read the Gpg4win version from the output of gpgconf --version
        ........
        SVN_MERGE
      ................
        r1033294 | tmcguire | 2009-10-09 23:08:53 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1031875 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1031875 | mutz | 2009-10-06 13:02:39 +0200 (Tue, 06 Oct 2009) | 1 line
          
          LearnCardKeysCommand: Fix command line for gpg
        ........
        SVN_MERGE
      ................
        r1033295 | tmcguire | 2009-10-09 23:09:27 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1032208 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1032208 | mutz | 2009-10-07 11:47:38 +0200 (Wed, 07 Oct 2009) | 1 line
          
          MainWindow: suppress kde version and translators tab in the About Gpg4win-dialog (where both would duplicate the information from the About Kleopatra-dialog)
        ........
        SVN_MERGE
      ................
        r1033296 | tmcguire | 2009-10-09 23:09:58 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1032210 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1032210 | mutz | 2009-10-07 11:53:07 +0200 (Wed, 07 Oct 2009) | 1 line
          
          MainWindow: only include "About Gpg4win" on Windows
        ........
        SVN_MERGE
      ................
        r1033297 | tmcguire | 2009-10-09 23:10:28 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1032276 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1032276 | mutz | 2009-10-07 15:17:24 +0200 (Wed, 07 Oct 2009) | 1 line
          
          SysTrayIcon: disable whole smartcard-submenu when none of the child actions are enabled
        ........
        SVN_MERGE
      ................
        r1033299 | tmcguire | 2009-10-09 23:11:01 +0200 (Fri, 09 Oct 2009) | 10 lines
        
        Merged revisions 1032292 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1032292 | mutz | 2009-10-07 15:51:40 +0200 (Wed, 07 Oct 2009) | 1 line
          
          SysTrayIcon: make it clear that we only support NetKey v3 cards (so far)
        ........
        SVN_MERGE
      ................
        r1033326 | djarvie | 2009-10-09 23:56:21 +0200 (Fri, 09 Oct 2009) | 2 lines
        
        Ensure all-day is set consistently for recurrences
      ................
        r1033332 | djarvie | 2009-10-10 00:05:41 +0200 (Sat, 10 Oct 2009) | 1 line
        
        Nitpick
      ................
        r1033340 | momeny | 2009-10-10 00:19:35 +0200 (Sat, 10 Oct 2009) | 1 line
        
        A little improvement on Editor! And better detection of textCharFormat change to sync toolbar with text!
      ................
        r1033376 | djarvie | 2009-10-10 01:55:29 +0200 (Sat, 10 Oct 2009) | 1 line
        
        Don't waste processing time calculating next trigger time for archived alarms
      ................
        r1033438 | sengels | 2009-10-10 12:27:30 +0200 (Sat, 10 Oct 2009) | 1 line
        
        we do not need an export for templates
      ................
        r1033489 | tstaerk | 2009-10-10 13:47:32 +0200 (Sat, 10 Oct 2009) | 4 lines
        
        Remove memory leak.
        
        BUGS:209674
      ................
        r1033595 | scripty | 2009-10-10 16:26:55 +0200 (Sat, 10 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1033690 | coles | 2009-10-10 21:39:14 +0200 (Sat, 10 Oct 2009) | 6 lines
        
        Minor proof-reading changes:
        
        - don't -> do not, for consistency with rest of KDE;
        - the two messages referring to 'not yet completed' now have consistent form.
      ................
        r1033723 | coles | 2009-10-10 23:29:54 +0200 (Sat, 10 Oct 2009) | 6 lines
        
        Minor proof-reading changes.
        
        (Note that a 'LDAP' was changed to 'an LDAP' as 'ell-DAP' or 'ell-dee-ay-pee'
        begin with vowel sounds.)
      ................
        r1033732 | djarvie | 2009-10-10 23:55:09 +0200 (Sat, 10 Oct 2009) | 2 lines
        
        Fix whatsthis not appearing
      ................
        r1033736 | coles | 2009-10-11 00:15:44 +0200 (Sun, 11 Oct 2009) | 3 lines
        
        Proof-reading, and correcting a few plural-form uses (or rather the lack thereof).
      ................
        r1033749 | djarvie | 2009-10-11 00:55:33 +0200 (Sun, 11 Oct 2009) | 2 lines
        
        Encapsulate sub-repetitions in new Repetition class
      ................
        r1033794 | cfeck | 2009-10-11 07:17:05 +0200 (Sun, 11 Oct 2009) | 9 lines
        
        Do not use add_subdirectory() when there is no CMakeLists.txt
        
        Volker, I disabled examples from kdepim/CMakeLists.txt, because I
        was not sure if the missing examples/CMakeLists.txt was intended to
        not build the examples. Please uncomment/revert to build them.
        
        CCMAIL: vkrause@kde.org
        CCMAIL: neundorf@kde.org
      ................
        r1033828 | scripty | 2009-10-11 11:43:34 +0200 (Sun, 11 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1033871 | winterz | 2009-10-11 14:49:49 +0200 (Sun, 11 Oct 2009) | 3 lines
        
        New feature: show events from my calendar only
        MERGE: none
      ................
        r1033880 | winterz | 2009-10-11 15:18:38 +0200 (Sun, 11 Oct 2009) | 3 lines
        
        CamelCase headers
        cleanup unused headers, forward class declarations, and namespaces
      ................
        r1033892 | winterz | 2009-10-11 15:39:35 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        full tooltips and whatsthis
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1033905 | winterz | 2009-10-11 16:34:41 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        CamelCase headers
        cleanup unused headers, forward class declarations
        MERGE: none
      ................
        r1033915 | winterz | 2009-10-11 17:18:33 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        helpText for actions.
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1033916 | winterz | 2009-10-11 17:19:18 +0200 (Sun, 11 Oct 2009) | 3 lines
        
        update my copyright years
        SVN_SILENT:
      ................
        r1033926 | winterz | 2009-10-11 17:46:57 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        CamelCase headers
        cleanup unused headers and forward class declarations
        MERGE: none
      ................
        r1033930 | winterz | 2009-10-11 17:52:34 +0200 (Sun, 11 Oct 2009) | 3 lines
        
        minor coding style
        SVN_SILENT:
      ................
        r1033937 | djarvie | 2009-10-11 18:07:24 +0200 (Sun, 11 Oct 2009) | 2 lines
        
        Remove dependency on kalocale.h
      ................
        r1033942 | winterz | 2009-10-11 18:12:54 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        full tooltips and whatsthis
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1033945 | djarvie | 2009-10-11 18:29:25 +0200 (Sun, 11 Oct 2009) | 2 lines
        
        Fix operator==() and operator!=()
      ................
        r1034062 | winterz | 2009-10-11 23:11:32 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        CamelCase headers
        cleanup unused headers and forward class declarations.
        MERGE: none
      ................
        r1034070 | winterz | 2009-10-11 23:24:15 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        full tooltips, whatsthis and helptext
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1034077 | mkoller | 2009-10-11 23:50:43 +0200 (Sun, 11 Oct 2009) | 4 lines
        
        BUG: 160215
        
        On smart-reply, use the ReplyAll template only when it's a reply to a mailing list
      ................
        r1034083 | winterz | 2009-10-12 00:23:57 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        CamelCase headers
        cleanup unused headers and forward class declarations.
        MERGE: none
      ................
        r1034085 | winterz | 2009-10-12 00:35:42 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        full tooltip, whatsthis, and help text
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1034087 | winterz | 2009-10-12 00:46:58 +0200 (Mon, 12 Oct 2009) | 2 lines
        
        --deprecated
      ................
        r1034090 | winterz | 2009-10-12 00:51:26 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        QTextEdit -> KTextEdit
        MERGE: none
      ................
        r1034092 | winterz | 2009-10-12 01:01:35 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        CamelCase headers
        cleanup unused headers
        MERGE: none
      ................
        r1034093 | winterz | 2009-10-12 01:02:57 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        add helptext to the New action
        MERGE: none
        DO_NOT_BACKPORT: new i18n string
      ................
        r1034095 | winterz | 2009-10-12 01:08:33 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        CamelCase headers
        remove unused headers
        MERGE: none
      ................
        r1034097 | winterz | 2009-10-12 01:11:08 +0200 (Mon, 12 Oct 2009) | 3 lines
        
        minor coding style fixes
        SVN_SILENT:
      ................
        r1034104 | winterz | 2009-10-12 01:37:38 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        help text
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1034105 | winterz | 2009-10-12 01:42:17 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        CamelCase headers
        remove unused headers
        MERGE: none
      ................
        r1034106 | winterz | 2009-10-12 01:44:41 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        help text for the New Page and New Book actions
        MERGE: none
        DO_NOT_BACKPORT: new i18n strings
      ................
        r1034107 | winterz | 2009-10-12 01:50:09 +0200 (Mon, 12 Oct 2009) | 3 lines
        
        CamelCase headers
        remove unused headers
      ................
        r1034108 | winterz | 2009-10-12 01:51:25 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        add a help text for the New Article action
        MERGE: none
        DO_NOT_BACKPORT: new i18n string
      ................
        r1034110 | winterz | 2009-10-12 01:56:10 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        CamelCase headers
        remove unused headers
        MERGE: none
      ................
        r1034111 | winterz | 2009-10-12 01:58:04 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        add help text for New Task
        MERGE: none
        DO_NOT_BACKPORT: new i18n string
      ................
        r1034268 | winterz | 2009-10-12 12:50:27 +0200 (Mon, 12 Oct 2009) | 2 lines
        
        tell Krazy to look for more stuff as this is shiny new code.
      ................
        r1034274 | vkrause | 2009-10-12 13:17:12 +0200 (Mon, 12 Oct 2009) | 2 lines
        
        Make sure new tags have a useful label.
      ................
        r1034275 | vkrause | 2009-10-12 13:17:58 +0200 (Mon, 12 Oct 2009) | 2 lines
        
        Move clients/kabc to examples as well and re-enable compilation of them.
      ................
        r1034285 | winterz | 2009-10-12 13:37:23 +0200 (Mon, 12 Oct 2009) | 2 lines
        
        the kabc subdir is gone
      ................
        r1034311 | skelly | 2009-10-12 14:40:17 +0200 (Mon, 12 Oct 2009) | 1 line
        
        Use the move actions in akonadi console.
      ................
        r1034323 | coles | 2009-10-12 15:06:21 +0200 (Mon, 12 Oct 2009) | 5 lines
        
        A couple of minor typo corrections.
        
        SVN_SILENT
      ................
        r1034325 | coles | 2009-10-12 15:09:37 +0200 (Mon, 12 Oct 2009) | 4 lines
        
        Minor proof-reading.  Couldn't -> Could not for consistency with rest of KDE,
        and hyphenated Server-Side.
      ................
        r1034336 | coles | 2009-10-12 15:30:52 +0200 (Mon, 12 Oct 2009) | 3 lines
        
        Minor proof-reading changes.
      ................
        r1034337 | coles | 2009-10-12 15:36:35 +0200 (Mon, 12 Oct 2009) | 3 lines
        
        Proof-reading messages.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1034401
      3238c3f3
  30. 01 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · fb0846d5
      Volker Krause authored
      Merged revisions 1029580,1029661,1029689,1029710,1029713-1029714,1029760,1029782,1029796,1029798-1029804,1029837,1029864-1029865,1029867,1029885 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1029580 | scripty | 2009-09-30 11:41:51 +0200 (Wed, 30 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1029661 | winterz | 2009-09-30 15:21:02 +0200 (Wed, 30 Sep 2009) | 2 lines
        
        fix typo "QString:: null" -> QString()
      ................
        r1029689 | vkrause | 2009-09-30 16:46:20 +0200 (Wed, 30 Sep 2009) | 7 lines
        
        Steal Strigi code from the right place (Nepomuk Strigi indexer rather
        than the obsolete Strigi feeder agent). Now attachment indexing works :)
        
        Still highly inefficient and has no error handling, but this should be
        moved to the feeder agent base class anyway, it's needed for indexing
        KCal/KABC attachments as well.
      ................
        r1029710 | skelly | 2009-09-30 17:36:49 +0200 (Wed, 30 Sep 2009) | 1 line
        
        Disable the fetch more stuff from modeltest.
      ................
        r1029713 | skelly | 2009-09-30 17:37:54 +0200 (Wed, 30 Sep 2009) | 1 line
        
        Show hidden collections in akocon.
      ................
        r1029714 | skelly | 2009-09-30 17:37:59 +0200 (Wed, 30 Sep 2009) | 3 lines
        
        s/Monitor/ChangeRecorder/g
        
        Update for changed EntityTreeModel API.
      ................
        r1029760 | tmcguire | 2009-09-30 19:16:14 +0200 (Wed, 30 Sep 2009) | 300 lines
        
        Block cyclic merges, release stuff, blocks, etc
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 1027252-1027254,1027257-1027258,1027260,1027262-1027263,1027933,1027935,1027999,1028911,1029057-1029059,1029061-1029063,1029339 via svnmerge
        
        ................
          r1027252 | tmcguire | 2009-09-23 18:58:20 +0200 (Wed, 23 Sep 2009) | 68 lines
          
          Block cyclic merges, scripty, ktimetracker, ...
          SVN_SILENT
          Blocked revisions 1024449,1024451,1024458,1025325,1026315 via svnmerge
          
          ................
            r1024449 | scripty | 2009-09-16 18:14:42 +0200 (Wed, 16 Sep 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1024451 | tmcguire | 2009-09-16 18:15:50 +0200 (Wed, 16 Sep 2009) | 20 lines
            
            Backport r1024429 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1022284 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1022284 | winterz | 2009-09-11 13:19:22 +0200 (Fri, 11 Sep 2009) | 9 lines
              
              Merged revisions 1022235 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1022235 | mutz | 2009-09-11 04:40:28 -0400 (Fri, 11 Sep 2009) | 1 line
                
                Don't leave a signTestNode lying around if we've already written out a deferred decryption block. Fixes regression kolab/issue3577.
              ........
            ................
          ................
            r1024458 | tmcguire | 2009-09-16 18:17:02 +0200 (Wed, 16 Sep 2009) | 24 lines
            
            Backport r1024425 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1021557 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1021557 | winterz | 2009-09-09 16:07:16 +0200 (Wed, 09 Sep 2009) | 13 lines
              
              Merged revisions 1021405 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1021405 | mutz | 2009-09-09 02:10:05 -0400 (Wed, 09 Sep 2009) | 5 lines
                
                certmanager/lib/ui/messagebox.cpp: make saved auditlog valid HTML
                
                Before, we were writing out the QtML that we have in the QTextEdit. Now, we
                keep a pristine copy of the audit log as received from the backend, and wrap
                it in <html><head><title>{caption}</title></head><body>...</body></html>
              ........
            ................
          ................
            r1025325 | cgiboudeaux | 2009-09-18 14:06:27 +0200 (Fri, 18 Sep 2009) | 5 lines
            
            Fix an include issue when building kdepim branch vs. kdelibs trunk + 4.3/experimental
            
            MERGE: none
          ................
            r1026315 | tstaerk | 2009-09-21 14:43:04 +0200 (Mon, 21 Sep 2009) | 4 lines
            
            Allow handing over a parameter to work on a specific iCalendar file.
            Backport of 1026234.
            CCBUGS:194865
          ................
        ................
          r1027253 | tmcguire | 2009-09-23 19:04:43 +0200 (Wed, 23 Sep 2009) | 9 lines
          
          Merged revisions 1024448 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1024448 | tmcguire | 2009-09-16 18:14:36 +0200 (Wed, 16 Sep 2009) | 1 line
            
            Backport the fixes for the incorrect iterator porting from trunk to the 4.3 branch.
          ........
        ................
          r1027254 | tmcguire | 2009-09-23 19:07:39 +0200 (Wed, 23 Sep 2009) | 11 lines
          
          Merged revisions 1024907 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1024907 | dfaure | 2009-09-17 16:44:39 +0200 (Thu, 17 Sep 2009) | 4 lines
            
            Add null-check in setTitle too (r990396 was about tabWidthForMaxChars).
            Fix will be in 4.3.2.
            BUG: 185597
          ........
        ................
          r1027257 | tmcguire | 2009-09-23 19:11:53 +0200 (Wed, 23 Sep 2009) | 11 lines
          
          Merged revisions 1026391 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1026391 | winterz | 2009-09-21 20:09:27 +0200 (Mon, 21 Sep 2009) | 4 lines
            
            Backport r1023692 by tmcguire from trunk to the 4.3 branch:
            
            Remove unneeded code, this is done in setTimeEditorsEnabled() already, and even correctly (obeying allday setting)
          ........
        ................
          r1027258 | tmcguire | 2009-09-23 19:15:41 +0200 (Wed, 23 Sep 2009) | 11 lines
          
          Merged revisions 1026392 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1026392 | winterz | 2009-09-21 20:09:54 +0200 (Mon, 21 Sep 2009) | 4 lines
            
            Backport r1023693 by tmcguire from trunk to the 4.3 branch:
            
            Didn't want to remove this in r1023692.
          ........
        ................
          r1027260 | tmcguire | 2009-09-23 19:18:16 +0200 (Wed, 23 Sep 2009) | 13 lines
          
          Merged revisions 1026393 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1026393 | winterz | 2009-09-21 20:10:23 +0200 (Mon, 21 Sep 2009) | 7 lines
            
            Backport r1023697 by tmcguire from trunk to the 4.3 branch:
            
            Set the correct time zone when setting the defaults.
            This and my previous commits have the effect that when creating all day events, the time
            zone is correctly shown as "Floating".
          ........
        ................
          r1027262 | tmcguire | 2009-09-23 19:23:17 +0200 (Wed, 23 Sep 2009) | 16 lines
          
          Merged revisions 1026400 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1026400 | winterz | 2009-09-21 20:26:14 +0200 (Mon, 21 Sep 2009) | 10 lines
            
            Backport r1026321 by winterz from trunk to the 4.3 branch:
            
            use qobject_cast instead of dynamic_cast where possible
            check for invalid start/end dates
            check for incidence=0
            in general, a bunch of little changes for guarding against crashes in Month view.
            CCBUG: 197507
            MERGE: 4.3
          ........
        ................
          r1027263 | tmcguire | 2009-09-23 19:24:47 +0200 (Wed, 23 Sep 2009) | 12 lines
          
          Merged revisions 1026401 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1026401 | winterz | 2009-09-21 20:26:40 +0200 (Mon, 21 Sep 2009) | 6 lines
            
            Backport r1026322 by winterz from trunk to the 4.3 branch:
            
            guard against showing a popup for an invalid date.
            MERGE: 4.3
          ........
        ................
          r1027933 | tmcguire | 2009-09-25 10:24:06 +0200 (Fri, 25 Sep 2009) | 1 line
          
          Update Newslog.txt
        ................
          r1027935 | tmcguire | 2009-09-25 10:25:10 +0200 (Fri, 25 Sep 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1027999 | winterz | 2009-09-25 14:10:24 +0200 (Fri, 25 Sep 2009) | 16 lines
          
          Blocked revisions 1027930-1027931,1027934 via svnmerge
          
          ........
            r1027930 | tmcguire | 2009-09-25 04:14:19 -0400 (Fri, 25 Sep 2009) | 1 line
            
            Update Newslog.txt
          ........
            r1027931 | tmcguire | 2009-09-25 04:17:38 -0400 (Fri, 25 Sep 2009) | 1 line
            
            SVN_SILENT fix date
          ........
            r1027934 | tmcguire | 2009-09-25 04:24:51 -0400 (Fri, 25 Sep 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1028911 | winterz | 2009-09-28 15:09:30 +0200 (Mon, 28 Sep 2009) | 8 lines
          
          Blocked revisions 1028909 via svnmerge
          
          ........
            r1028909 | mutz | 2009-09-28 09:01:52 -0400 (Mon, 28 Sep 2009) | 1 line
            
            Kleo::MessageBox: fix "debug output not ended with \n" warning
          ........
        ................
          r1029057 | winterz | 2009-09-28 23:24:51 +0200 (Mon, 28 Sep 2009) | 9 lines
          
          Blocked revisions 1024845 via svnmerge
          
          ........
            r1024845 | winterz | 2009-09-17 07:41:19 -0400 (Thu, 17 Sep 2009) | 3 lines
            
            add Nuno's new icons for anniversary, birthday, and special occassion
            MERGE: none
          ........
        ................
          r1029058 | winterz | 2009-09-28 23:25:48 +0200 (Mon, 28 Sep 2009) | 12 lines
          
          Blocked revisions 1024932 via svnmerge
          
          ........
            r1024932 | winterz | 2009-09-17 12:35:28 -0400 (Thu, 17 Sep 2009) | 6 lines
            
            rename the new calendar icons so that the buildsystem installs them properly.
            apparently each '-' separated string in the name becomes a new subdir
            in the installation path.
            
            MERGE: none (the cmake buildsystem doesn't require the renaming)
          ........
        ................
          r1029059 | winterz | 2009-09-28 23:26:48 +0200 (Mon, 28 Sep 2009) | 8 lines
          
          Blocked revisions 1027123 via svnmerge
          
          ........
            r1027123 | ludwigreiter | 2009-09-23 06:33:47 -0400 (Wed, 23 Sep 2009) | 2 lines
            
            Removed not-fixed kolab/issue3864 and kolab/issue3863
          ........
        ................
          r1029061 | winterz | 2009-09-28 23:29:44 +0200 (Mon, 28 Sep 2009) | 13 lines
          
          Recorded merge of revisions 1028964 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1028964 | winterz | 2009-09-28 12:28:44 -0400 (Mon, 28 Sep 2009) | 7 lines
            
            add an active data parameter to the IncidenceFormatter::extensiveDisplayStr() and toolTipStr()
            to use in recurring Incidences so correct start/end/due dates can be displayed.
            kolab/issue3813
            
            MERGE: e4 (already in trunk)
          ........
        ................
          r1029062 | winterz | 2009-09-28 23:31:02 +0200 (Mon, 28 Sep 2009) | 14 lines
          
          Blocked revisions 1028968,1028981 via svnmerge
          
          ........
            r1028968 | winterz | 2009-09-28 12:53:56 -0400 (Mon, 28 Sep 2009) | 2 lines
            
            fix a crash showing monthview item tooltips. part of the kolab/issue3813 fix.
          ........
            r1028981 | winterz | 2009-09-28 13:20:16 -0400 (Mon, 28 Sep 2009) | 4 lines
            
            fix printing the next occurrence in recurring events and to-dos.
            basically I had forgotten to remove some old code.
            MERGE: none
          ........
        ................
          r1029063 | winterz | 2009-09-28 23:32:28 +0200 (Mon, 28 Sep 2009) | 12 lines
          
          Recorded merge of revisions 1028978 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1028978 | winterz | 2009-09-28 13:15:44 -0400 (Mon, 28 Sep 2009) | 5 lines
            
            second do'h related to signal signatures today.
            fix eventviewer showing a newly selected incidence.
            kolab/issue3813
            MERGE: e4
          ........
        ................
          r1029339 | winterz | 2009-09-29 17:13:37 +0200 (Tue, 29 Sep 2009) | 8 lines
          
          Blocked revisions 1029337 via svnmerge
          
          ........
            r1029337 | winterz | 2009-09-29 11:11:13 -0400 (Tue, 29 Sep 2009) | 2 lines
            
            whoopsie. restore the kpilot plugin build
          ........
        ................
      ................
        r1029782 | tokoe | 2009-09-30 20:23:17 +0200 (Wed, 30 Sep 2009) | 2 lines
        
        link with gold
      ................
        r1029796 | tmcguire | 2009-09-30 20:52:03 +0200 (Wed, 30 Sep 2009) | 17 lines
        
        Merged revisions 1027247 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027247 | winterz | 2009-09-23 18:49:31 +0200 (Wed, 23 Sep 2009) | 10 lines
          
          Merged revisions 1027235 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027235 | winterz | 2009-09-23 12:22:11 -0400 (Wed, 23 Sep 2009) | 3 lines
            
            in setHolidaysMasks(), avoid a crash if the selecteddates QList is empty.
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1029798 | tmcguire | 2009-09-30 20:56:07 +0200 (Wed, 30 Sep 2009) | 19 lines
        
        Merged revisions 1027305 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027305 | winterz | 2009-09-23 21:52:12 +0200 (Wed, 23 Sep 2009) | 12 lines
          
          Merged revisions 1027276 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027276 | tmcguire | 2009-09-23 14:19:38 -0400 (Wed, 23 Sep 2009) | 5 lines
            
            Use the clicked Url here, not the hovered.
            Fixes the "New Message To" action not working.
            kolab/issue3876
            MERGE: e4, trunk
          ........
        ................
      ................
        r1029799 | tmcguire | 2009-09-30 20:57:45 +0200 (Wed, 30 Sep 2009) | 17 lines
        
        Merged revisions 1027946 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027946 | tmcguire | 2009-09-25 10:36:37 +0200 (Fri, 25 Sep 2009) | 10 lines
          
          Merged revisions 1027157 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027157 | tmcguire | 2009-09-23 14:26:40 +0200 (Wed, 23 Sep 2009) | 3 lines
            
            Always set the identity when answering an invitation, as we need that to figure things
            like the transport out.
          ........
        ................
      ................
        r1029800 | tmcguire | 2009-09-30 20:59:35 +0200 (Wed, 30 Sep 2009) | 21 lines
        
        Merged revisions 1027948 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027948 | tmcguire | 2009-09-25 10:42:35 +0200 (Fri, 25 Sep 2009) | 14 lines
          
          Merged revisions 1027162,1027176 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027162 | tmcguire | 2009-09-23 14:56:38 +0200 (Wed, 23 Sep 2009) | 3 lines
            
            When answering an invitation, make sure the sticky identity/transport is _not_ used, rather use
            the identity of the receiver of the invitation.
          ........
            r1027176 | tmcguire | 2009-09-23 15:23:41 +0200 (Wed, 23 Sep 2009) | 1 line
            
            Actually make the previous commit work and don't save the settings in this case.
          ........
        ................
      ................
        r1029801 | tmcguire | 2009-09-30 21:01:06 +0200 (Wed, 30 Sep 2009) | 17 lines
        
        Merged revisions 1027953 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027953 | tmcguire | 2009-09-25 10:58:45 +0200 (Fri, 25 Sep 2009) | 10 lines
          
          Merged revisions 1027202 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027202 | tmcguire | 2009-09-23 16:40:09 +0200 (Wed, 23 Sep 2009) | 3 lines
            
            If we are not sure about which transport to use, better ask the user.
            Fixes kolab/issue3182
          ........
        ................
      ................
        r1029802 | tmcguire | 2009-09-30 21:02:34 +0200 (Wed, 30 Sep 2009) | 16 lines
        
        Merged revisions 1027954 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027954 | tmcguire | 2009-09-25 11:04:35 +0200 (Fri, 25 Sep 2009) | 9 lines
          
          Merged revisions 1027203 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027203 | tmcguire | 2009-09-23 16:48:29 +0200 (Wed, 23 Sep 2009) | 2 lines
            
            Fix scenario with default identity and make logic more readable
          ........
        ................
      ................
        r1029803 | tmcguire | 2009-09-30 21:04:03 +0200 (Wed, 30 Sep 2009) | 16 lines
        
        Merged revisions 1027956 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1027956 | tmcguire | 2009-09-25 11:06:43 +0200 (Fri, 25 Sep 2009) | 9 lines
          
          Merged revisions 1027206 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027206 | tmcguire | 2009-09-23 17:00:30 +0200 (Wed, 23 Sep 2009) | 1 line
            
            Don't ask for a transport if there is only one.
          ........
        ................
      ................
        r1029804 | tmcguire | 2009-09-30 21:05:12 +0200 (Wed, 30 Sep 2009) | 17 lines
        
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 1029055 via svnmerge
        
        ................
          r1029055 | winterz | 2009-09-28 23:23:10 +0200 (Mon, 28 Sep 2009) | 9 lines
          
          Merged revisions 1021206 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1021206 | winterz | 2009-09-08 10:32:04 -0400 (Tue, 08 Sep 2009) | 2 lines
            
            copy over a bunch of fixes we've made over the past few years in trunk.
          ........
        ................
      ................
        r1029837 | stikonas | 2009-09-30 23:16:05 +0200 (Wed, 30 Sep 2009) | 1 line
        
        Grammar: Use singular instead of plural when res.numRecipients()==1
      ................
        r1029864 | pokrzywka | 2009-10-01 00:56:51 +0200 (Thu, 01 Oct 2009) | 1 line
        
        nepomuk_email_feeder needs strigi client libs now, so only build it if those are available
      ................
        r1029865 | pokrzywka | 2009-10-01 00:57:53 +0200 (Thu, 01 Oct 2009) | 1 line
        
        missing include (could be a forward-declare ?)
      ................
        r1029867 | pokrzywka | 2009-10-01 01:09:09 +0200 (Thu, 01 Oct 2009) | 1 line
        
        another missing include
      ................
        r1029885 | cfeck | 2009-10-01 01:56:28 +0200 (Thu, 01 Oct 2009) | 12 lines
        
        Fix layout
        
        Also changed some strings:
            Event > event
            to-do > To-do (one occurence)
            KAddressBook -> address book
        
        I noticed that these UI files seem to contain duplicate widgets.
        Is there a way to merge the code for handling them?
        
        CCMAIL: winter@kde.org
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1029945
      fb0846d5
  31. 11 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · c081a624
      Volker Krause authored
      Merged revisions 1021844,1021905,1021943,1021954,1021958,1021978,1021986,1021989-1021990,1022005,1022008,1022030,1022037,1022045,1022251,1022263,1022266 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1021844 | vkrause | 2009-09-10 11:16:17 +0200 (Thu, 10 Sep 2009) | 3 lines
        
        Add Nepomuk tag and rating widgets to have an easy way of changing some
        info in Nepomuk for testing.
      ................
        r1021905 | vkrause | 2009-09-10 12:03:38 +0200 (Thu, 10 Sep 2009) | 2 lines
        
        Add the new "Virtual" capability.
      ................
        r1021943 | scripty | 2009-09-10 12:30:28 +0200 (Thu, 10 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1021954 | tnyblom | 2009-09-10 13:12:22 +0200 (Thu, 10 Sep 2009) | 4 lines
        
        Use the scrollbar for getting and setting the relative position.
        
        BUG: 177671
      ................
        r1021958 | tmcguire | 2009-09-10 13:32:54 +0200 (Thu, 10 Sep 2009) | 3 lines
        
        differentiate between clicked and hovered urls, fixes the regression that copying a link address didn't work anymore.
        MERGE: e3, e4
      ................
        r1021978 | tmcguire | 2009-09-10 14:37:22 +0200 (Thu, 10 Sep 2009) | 1 line
        
        Remove unused options, the reply phrases thing is long gone.
      ................
        r1021986 | vkrause | 2009-09-10 15:16:13 +0200 (Thu, 10 Sep 2009) | 6 lines
        
        Make the sync a bit more clever by only link/unlink stuff that actually
        changed, in fact unlink untagged objects at all.
        
        Now if I could figure out how to get change notifications from Nepomuk
        this thing would actually rock :)
      ................
        r1021989 | tnyblom | 2009-09-10 15:28:55 +0200 (Thu, 10 Sep 2009) | 3 lines
        
        Migrate some settings to KConfigXT
      ................
        r1021990 | vkrause | 2009-09-10 15:43:30 +0200 (Thu, 10 Sep 2009) | 2 lines
        
        Support tag deletion.
      ................
        r1022005 | winterz | 2009-09-10 16:33:26 +0200 (Thu, 10 Sep 2009) | 18 lines
        
        Blocked revisions 1022003 via svnmerge
        
        ................
          r1022003 | winterz | 2009-09-10 10:32:16 -0400 (Thu, 10 Sep 2009) | 12 lines
          
          Merged revisions 1021995 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1021995 | winterz | 2009-09-10 10:09:09 -0400 (Thu, 10 Sep 2009) | 5 lines
            
            backport SVN commit 1021958 by tmcguire from trunk to e35:
            
            differentiate between clicked and hovered urls, fixes the regression that copying a link address didn't work anymore.
            MERGE: e4
          ........
        ................
      ................
        r1022008 | vkrause | 2009-09-10 16:38:40 +0200 (Thu, 10 Sep 2009) | 2 lines
        
        Show link/unlink rights.
      ................
        r1022030 | winterz | 2009-09-10 17:46:51 +0200 (Thu, 10 Sep 2009) | 17 lines
        
        Blocked revisions 1022029 via svnmerge
        
        ................
          r1022029 | winterz | 2009-09-10 11:43:46 -0400 (Thu, 10 Sep 2009) | 11 lines
          
          Merged revisions 1022028 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1022028 | winterz | 2009-09-10 11:40:56 -0400 (Thu, 10 Sep 2009) | 4 lines
            
            backport super hack from trunk that might help fix the crash reported in
            kolab/issue3837
            MERGE: e4 (already in trunk)
          ........
        ................
      ................
        r1022037 | vkrause | 2009-09-10 18:07:14 +0200 (Thu, 10 Sep 2009) | 2 lines
        
        Tag/untag when linking/unlinking items.
      ................
        r1022045 | vkrause | 2009-09-10 18:42:18 +0200 (Thu, 10 Sep 2009) | 2 lines
        
        Allow to link/unlink items.
      ................
        r1022251 | scripty | 2009-09-11 11:39:49 +0200 (Fri, 11 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1022263 | tstaerk | 2009-09-11 11:53:31 +0200 (Fri, 11 Sep 2009) | 1 line
        
        Tell the users where to get the good documentation :) As discussed on the wiki meeting in Berlin.
      ................
        r1022266 | tnyblom | 2009-09-11 12:11:02 +0200 (Fri, 11 Sep 2009) | 7 lines
        
        Move the calls for saving the readers position into the update() functions.
        This eliminates the need for outside callers to remember when they should save
        the position.
        
        Fixes the issue with message jumping to start when a signature has been checked.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1022290
      c081a624
  32. 10 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 7036a2ba
      Volker Krause authored
      Merged revisions 1021457,1021459,1021473,1021514-1021515,1021518,1021522,1021525,1021527,1021532,1021534,1021536,1021540,1021545-1021546,1021549,1021551,1021553,1021561,1021580,1021591,1021657,1021698,1021821 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1021457 | tnyblom | 2009-09-09 10:54:51 +0200 (Wed, 09 Sep 2009) | 7 lines
        
        Crash guard.
        
        Should fix the symptoms in bug 153411, but it's not the cure.
        The null consumer should not be there at all.
        
        CCBUG: 153411
      ................
        r1021459 | tokoe | 2009-09-09 11:20:38 +0200 (Wed, 09 Sep 2009) | 3 lines
        
        Add first patch from Marquel to the NepomukCalendarFeeder
        with some small adaptions.
      ................
        r1021473 | scripty | 2009-09-09 11:51:14 +0200 (Wed, 09 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1021514 | tmcguire | 2009-09-09 14:55:37 +0200 (Wed, 09 Sep 2009) | 576 lines
        
        Block cyclic merges, release stuff, etc
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 1015870,1015923,1015931,1015933,1015935-1015937,1015941-1015942,1015944,1015946,1015949,1015951-1015954,1015957-1015958,1015963,1016360,1016651,1016654,1017787,1017873,1019070,1019447,1019850,1020969-1020970,1021200,1021288-1021289,1021295,1021301 via svnmerge
        
        ................
          r1015870 | tmcguire | 2009-08-26 15:34:46 +0200 (Wed, 26 Aug 2009) | 7 lines
          
          Crossport r1014138 by tmcguire from trunk to the enterprise4 branch:
          
          Fix the problem that the forward menu was empty, because the action list was
          plugged before createGUI() was called.
          Also, clean up a bit, for example don't set the shortcuts twice.
        ................
          r1015923 | winterz | 2009-08-26 18:12:14 +0200 (Wed, 26 Aug 2009) | 2 lines
          
          revert so I can fix my last svnmerge
        ................
          r1015931 | tmcguire | 2009-08-26 18:21:20 +0200 (Wed, 26 Aug 2009) | 118 lines
          
          Block cyclic merges, bugfixes for new features, KAlarm etc
          SVN_SILENT
          Blocked revisions 1013338,1013402,1013437,1013439,1013442,1013657,1013679,1013683,1014832,1014869,1015070,1015271 via svnmerge
          
          ................
            r1013338 | tmcguire | 2009-08-19 17:35:55 +0200 (Wed, 19 Aug 2009) | 7 lines
            
            Backport of:
            SVN commit 1012649 by tmcguire:
            
            Don't crash on mails where there are two embedded images on the same text block.
            
            CCBUG: 204214
          ................
            r1013402 | mkoller | 2009-08-19 21:30:29 +0200 (Wed, 19 Aug 2009) | 9 lines
            
            
            Backport r1013400 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 204257
            
            Don't unhide all folders when dragging over the tree, as the hidden
            folders got hidden due to a filter for a reason
          ................
            r1013437 | djarvie | 2009-08-19 23:15:59 +0200 (Wed, 19 Aug 2009) | 2 lines
            
            Bug 203957: fix alarms being marked invalid when restoring from previous session.
          ................
            r1013439 | tmcguire | 2009-08-19 23:16:21 +0200 (Wed, 19 Aug 2009) | 5 lines
            
            Backport r1013436 by tmcguire from trunk to the 4.3 branch:
            
            Don't crash when pasting an image from the clipboard.
          ................
            r1013442 | djarvie | 2009-08-19 23:27:48 +0200 (Wed, 19 Aug 2009) | 1 line
            
            Style
          ................
            r1013657 | winterz | 2009-08-20 13:45:11 +0200 (Thu, 20 Aug 2009) | 3 lines
            
            increase version string for upcoming 4.3.1 release.
            CCMAIL: kde-pim@kde.org
          ................
            r1013679 | winterz | 2009-08-20 14:39:56 +0200 (Thu, 20 Aug 2009) | 24 lines
            
            Backport r1007406 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1006371 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1006371 | winterz | 2009-08-03 18:17:49 +0200 (Mon, 03 Aug 2009) | 13 lines
              
              Merged revisions 1006369 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1006369 | winterz | 2009-08-03 12:09:55 -0400 (Mon, 03 Aug 2009) | 6 lines
                
                when DND email messages as attachments, try to use the mail subject as the
                attachment name.
                kolab/issue3772
                
                MERGE: e4,trunk
              ........
            ................
          ................
            r1013683 | winterz | 2009-08-20 14:40:47 +0200 (Thu, 20 Aug 2009) | 23 lines
            
            Backport r1013408 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1011454 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1011454 | winterz | 2009-08-14 19:37:54 +0200 (Fri, 14 Aug 2009) | 12 lines
              
              Merged revisions 1011452 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1011452 | winterz | 2009-08-14 13:19:44 -0400 (Fri, 14 Aug 2009) | 5 lines
                
                give attachments dragged from emails a proper name, even when the email subject
                is short.
                for kolab/issue3722
                MERGE: e4,trunk,4.3
              ........
            ................
          ................
            r1014832 | djarvie | 2009-08-24 00:16:20 +0200 (Mon, 24 Aug 2009) | 1 line
            
            Correct and add missing change
          ................
            r1014869 | scripty | 2009-08-24 05:33:36 +0200 (Mon, 24 Aug 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1015070 | winterz | 2009-08-24 14:32:18 +0200 (Mon, 24 Aug 2009) | 13 lines
            
            Backport r1015068 by winterz from trunk to the 4.3 branch:
            
            merge r1014915 | vkrause | 2009-08-24 04:57:14 -0400 (Mon, 24 Aug 2009)
            
            Unbreak LDAP completion.
            
            This reverts revisions 951431 and 951433 and adds a different fix for
            Kolab issue 1996 instead.
            
            Kolab issue 3359
          ................
            r1015271 | scripty | 2009-08-25 05:36:35 +0200 (Tue, 25 Aug 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
        ................
          r1015933 | tmcguire | 2009-08-26 18:24:01 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1013340 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1013340 | tmcguire | 2009-08-19 17:47:05 +0200 (Wed, 19 Aug 2009) | 6 lines
            
            Backport r1011385 by jtamate from trunk to the 4.3 branch:
            
            http://reviewboard.kde.org/r/1296/
            
            Make the menu entry "Use Fixed Font" follow what the reader win is doing.
          ........
        ................
          r1015935 | tmcguire | 2009-08-26 18:26:20 +0200 (Wed, 26 Aug 2009) | 10 lines
          
          Merged revisions 1013841 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1013841 | woebbe | 2009-08-20 23:30:09 +0200 (Thu, 20 Aug 2009) | 2 lines
            
            Also use the name of the attachment to determine the mime type if a silly, broken 
            client only gives you application/octet-stream as content type.
          ........
        ................
          r1015936 | tmcguire | 2009-08-26 18:30:27 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1013860 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1013860 | winterz | 2009-08-21 00:37:04 +0200 (Fri, 21 Aug 2009) | 6 lines
            
            Backport r1013858 by winterz from trunk to the 4.3 branch:
            
            print the date *and* the time for the reminder time values
            MERGE: 4.3
          ........
        ................
          r1015937 | tmcguire | 2009-08-26 18:31:34 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1014176 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014176 | mkoller | 2009-08-21 21:30:00 +0200 (Fri, 21 Aug 2009) | 7 lines
            
            Backport r1014175 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 151141
            
            Limit wordwrap to max 998 chars per line according to RFC2822
          ........
        ................
          r1015941 | winterz | 2009-08-26 18:38:00 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1015912 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
            
            fix initial sorting of the completion order entries
            kolab/issue3822
            
            MERGE: e4,trunk,4.3
          ........
        ................
          r1015942 | tmcguire | 2009-08-26 18:44:31 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1014190 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014190 | mkoller | 2009-08-21 22:09:49 +0200 (Fri, 21 Aug 2009) | 7 lines
            
            Backport r1014188 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 150759
            
            don't act on left/right cursor in a special way during selection (Shift pressed)
          ........
        ................
          r1015944 | tmcguire | 2009-08-26 18:45:40 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1014199 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014199 | mkoller | 2009-08-21 22:27:41 +0200 (Fri, 21 Aug 2009) | 7 lines
            
            Backport r1014198 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 150620
            
            fix lowercase typo which resulted in not detecting "OCT" as month
          ........
        ................
          r1015946 | tmcguire | 2009-08-26 18:46:54 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1014300 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014300 | winterz | 2009-08-22 13:54:08 +0200 (Sat, 22 Aug 2009) | 6 lines
            
            Backport r1014298 by winterz from trunk to the 4.3 branch:
            
            make sure the [Advanced] reminder button is enabled when editing Events and To-dos.
            MERGE: 4.3
          ........
        ................
          r1015949 | tmcguire | 2009-08-26 18:49:35 +0200 (Wed, 26 Aug 2009) | 17 lines
          
          Merged revisions 1014388 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014388 | winterz | 2009-08-22 20:05:36 +0200 (Sat, 22 Aug 2009) | 11 lines
            
            Backport r1014387 by winterz from trunk to the 4.3 branch:
            
            in the D-Bus version of openComposer(), make sure to actually send the message
            if the hidden option is set.
            
            Note that one of the other openComposer() methods also has this possible bug but
            I'm not changing that at this time in order to reduce the possibility of regressions.
            
            MERGE: 4.3
          ........
        ................
          r1015951 | tmcguire | 2009-08-26 18:52:42 +0200 (Wed, 26 Aug 2009) | 14 lines
          
          Merged revisions 1014440 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014440 | mkoller | 2009-08-22 22:40:48 +0200 (Sat, 22 Aug 2009) | 8 lines
            
            Backport r1014434 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 204780
            
            when cursor is in top most line, cursor up shall move focus to subject line
            also when cursor is after the last char in the line.
          ........
        ................
          r1015952 | tmcguire | 2009-08-26 18:55:04 +0200 (Wed, 26 Aug 2009) | 17 lines
          
          Not needed here.
          SVN_SILENT
          Blocked revisions 1014458 via svnmerge
          
          ........
            r1014458 | mkoller | 2009-08-22 23:39:19 +0200 (Sat, 22 Aug 2009) | 9 lines
            
            backport r1005691 by mkoller:
            
            make "mail to mailing list" action work again also on folders which
            do not contain a ML, which then - as was implemented in the slot - creates a
            normal new message without a To address.
            This make kmail compatible to KDE3 again and it simplifies the toolbar
            when a user uses the action "mail to mailing list" for all new mail creation - 
            without the need to think about which toolbutton (new mail or new mail to ML) to click...
          ........
        ................
          r1015953 | tmcguire | 2009-08-26 18:56:35 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1014683 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014683 | mkoller | 2009-08-23 17:29:59 +0200 (Sun, 23 Aug 2009) | 7 lines
            
            Backport r1014681 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 204765
            
            make sure to interpret status text as HTML instead showing tags as plain text
          ........
        ................
          r1015954 | tmcguire | 2009-08-26 18:58:48 +0200 (Wed, 26 Aug 2009) | 11 lines
          
          Merged revisions 1014688 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1014688 | mkoller | 2009-08-23 17:42:29 +0200 (Sun, 23 Aug 2009) | 5 lines
            
            Backport r1014687 by mkoller from trunk to the 4.3 branch:
            
            Properly decode mailto URL when dropping
          ........
        ................
          r1015957 | tmcguire | 2009-08-26 19:05:08 +0200 (Wed, 26 Aug 2009) | 14 lines
          
          Merged revisions 1015554 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1015554 | mkoller | 2009-08-25 22:53:27 +0200 (Tue, 25 Aug 2009) | 8 lines
            
            Backport r1015553 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 166922
            
            When not printing from kmail's separate reader window, use the font
            specified in the font settings.
          ........
        ................
          r1015958 | tmcguire | 2009-08-26 19:05:58 +0200 (Wed, 26 Aug 2009) | 13 lines
          
          Merged revisions 1015563 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1015563 | winterz | 2009-08-25 23:23:00 +0200 (Tue, 25 Aug 2009) | 7 lines
            
            Backport r1015561 by winterz from trunk to the 4.3 branch:
            
            fix crash that can happen when editing a to-do.
            CCBUG: 205067
            MERGE: 4.3
          ........
        ................
          r1015963 | tmcguire | 2009-08-26 19:07:18 +0200 (Wed, 26 Aug 2009) | 31 lines
          
          The Akregator blocks.
          CCMAIL: frank.osterfeld@kdemail.net
          SVN_SILENT
          Blocked revisions 1014557,1014560-1014561 via svnmerge
          
          ........
            r1014557 | osterfeld | 2009-08-23 12:48:46 +0200 (Sun, 23 Aug 2009) | 6 lines
            
            backport
            
            SVN commit 1011040 by mjansen:
            
            Fix memleak. Free the dummy factory if registerFactory returns false.
          ........
            r1014560 | osterfeld | 2009-08-23 12:51:32 +0200 (Sun, 23 Aug 2009) | 6 lines
            
            backport
            
            SVN commit 1011042 by mjansen:
            
            Fix memleak. Delete the articleModel if SelectionController is destroyed.
          ........
            r1014561 | osterfeld | 2009-08-23 12:52:40 +0200 (Sun, 23 Aug 2009) | 6 lines
            
            backport
            
            SVN commit 1011043 by mjansen:
            
            Fix memleak. Delete all registered factories when destroying the factory.
          ........
        ................
          r1016360 | winterz | 2009-08-27 17:49:35 +0200 (Thu, 27 Aug 2009) | 12 lines
          
          Recorded merge of revisions 1016324 via svnmerge from 
          Looks like this was already done in E4.
          
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1016324 | winterz | 2009-08-27 10:25:26 -0400 (Thu, 27 Aug 2009) | 3 lines
            
            remove the boxCenter as the image for it doesn't exist.
            MERGE: e4
          ........
        ................
          r1016651 | tmcguire | 2009-08-28 14:43:26 +0200 (Fri, 28 Aug 2009) | 1 line
          
          Update Newslog.txt
        ................
          r1016654 | tmcguire | 2009-08-28 14:44:45 +0200 (Fri, 28 Aug 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1017787 | winterz | 2009-08-31 16:16:45 +0200 (Mon, 31 Aug 2009) | 12 lines
          
          Blocked revisions 1016647,1016653 via svnmerge
          
          ........
            r1016647 | tmcguire | 2009-08-28 08:30:45 -0400 (Fri, 28 Aug 2009) | 1 line
            
            Update Newslog.txt.
          ........
            r1016653 | tmcguire | 2009-08-28 08:44:44 -0400 (Fri, 28 Aug 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1017873 | winterz | 2009-08-31 21:16:37 +0200 (Mon, 31 Aug 2009) | 26 lines
          
          Merged revisions 1017406,1017525,1017535 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1017406 | winterz | 2009-08-30 11:17:58 -0400 (Sun, 30 Aug 2009) | 5 lines
            
            follow recent changes in the trunk incidenceformatter for the displayViewer.
            part of the fixes for kolab/issue3618
            
            MERGE:e4
          ........
            r1017525 | winterz | 2009-08-30 16:31:30 -0400 (Sun, 30 Aug 2009) | 6 lines
            
            part 2: 
            follow recent changes in the trunk incidenceformatter for the displayViewer.
            part of the fixes for kolab/issue3618
            
            MERGE: e4
          ........
            r1017535 | winterz | 2009-08-30 16:57:03 -0400 (Sun, 30 Aug 2009) | 4 lines
            
            follow trunk for part3 of fixes for displayView formatting
            continuing improvements for kolab/issue3816
            MERGE: e4
          ........
        ................
          r1019070 | winterz | 2009-09-02 20:58:23 +0200 (Wed, 02 Sep 2009) | 9 lines
          
          merge SVN commit 1019064 by winterz from trunk to e4
          
          show UTC incidences in the local time zone, which is especially useful
          for Kolab users who see all their incidences in UTC.
          
          Based on a patch from Steffen Hanikel. Thanks!
          
          NOT needed in e35
        ................
          r1019447 | winterz | 2009-09-03 18:45:49 +0200 (Thu, 03 Sep 2009) | 13 lines
          
          Recorded merge of revisions 1019442 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019442 | winterz | 2009-09-03 11:57:21 -0400 (Thu, 03 Sep 2009) | 7 lines
            
            backport SVN commit 1017853 by winterz from trunk to e35:
            
            follow the new IncidenceFormatter methods that put the Calendar name in
            the tooltip and displayView
            MERGE: e4
          ........
        ................
          r1019850 | winterz | 2009-09-04 18:19:01 +0200 (Fri, 04 Sep 2009) | 10 lines
          
          Blocked revisions 1019849 via svnmerge
          
          ........
            r1019849 | winterz | 2009-09-04 12:17:38 -0400 (Fri, 04 Sep 2009) | 4 lines
            
            remove the non-functional [...] button adjacent to the optional ReplyTo.
            fixes kolab/issue3803
            MERGE: none
          ........
        ................
          r1020969 | tmcguire | 2009-09-07 20:25:10 +0200 (Mon, 07 Sep 2009) | 1 line
          
          Update Newslog.txt
        ................
          r1020970 | tmcguire | 2009-09-07 20:28:32 +0200 (Mon, 07 Sep 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1021200 | winterz | 2009-09-08 16:03:54 +0200 (Tue, 08 Sep 2009) | 17 lines
          
          Blocked revisions 1018164,1020965,1020971 via svnmerge
          
          ........
            r1018164 | winterz | 2009-09-01 07:42:33 -0400 (Tue, 01 Sep 2009) | 3 lines
            
            calendarhelper isn't ready yet. so remove it.
            this was committed by mistake.
          ........
            r1020965 | tmcguire | 2009-09-07 14:18:54 -0400 (Mon, 07 Sep 2009) | 1 line
            
            Update Newslog.txt
          ........
            r1020971 | tmcguire | 2009-09-07 14:28:39 -0400 (Mon, 07 Sep 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1021288 | winterz | 2009-09-08 21:27:10 +0200 (Tue, 08 Sep 2009) | 6 lines
          
          merge SVN commit 1021235 by lueck from trunk to e4:
          
          add a desktop file for kontact-admin documentation to make it visible in khelpcenters navigation tree
          
          MERGE: none
        ................
          r1021289 | winterz | 2009-09-08 21:28:40 +0200 (Tue, 08 Sep 2009) | 8 lines
          
          Blocked revisions 1021150 via svnmerge
          
          ........
            r1021150 | ludwigreiter | 2009-09-08 06:27:24 -0400 (Tue, 08 Sep 2009) | 2 lines
            
            Removed not-fixed kolab/issue3717.
          ........
        ................
          r1021295 | winterz | 2009-09-08 21:40:47 +0200 (Tue, 08 Sep 2009) | 13 lines
          
          Merged revisions 1021292 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1021292 | winterz | 2009-09-08 15:35:40 -0400 (Tue, 08 Sep 2009) | 6 lines
            
            backport SVN commit 1021059 by winterz from trunk to e35:
            
            handle problems with editing in a more user-friendly way.
            
            MERGE: e4
          ........
        ................
          r1021301 | winterz | 2009-09-08 21:51:08 +0200 (Tue, 08 Sep 2009) | 13 lines
          
          Merged revisions 1021298 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1021298 | winterz | 2009-09-08 15:45:53 -0400 (Tue, 08 Sep 2009) | 6 lines
            
            backport SVN commit 1021060 by winterz from trunk to e35:
            
            improve error checking and error messages for failures in editing.
            
            MERGE: e4
          ........
        ................
      ................
        r1021515 | tmcguire | 2009-09-09 14:58:33 +0200 (Wed, 09 Sep 2009) | 18 lines
        
        SVN_MERGE
        Merged revisions 1015875 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015875 | tmcguire | 2009-08-26 15:49:42 +0200 (Wed, 26 Aug 2009) | 10 lines
          
          Merged revisions 1015834 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015834 | tmcguire | 2009-08-26 14:24:04 +0200 (Wed, 26 Aug 2009) | 3 lines
            
            Fix Till's todo: Also take local folders into account when collecting the resource folders.
            Fixes kolab/issue3792.
          ........
        ................
      ................
        r1021518 | tmcguire | 2009-09-09 15:05:00 +0200 (Wed, 09 Sep 2009) | 23 lines
        
        SVN_MERGE
        Merged revisions 1015902 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015902 | tmcguire | 2009-08-26 17:11:13 +0200 (Wed, 26 Aug 2009) | 15 lines
          
          Merged revisions 1015811 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015811 | tmcguire | 2009-08-26 13:55:50 +0200 (Wed, 26 Aug 2009) | 8 lines
            
            Make dragging attachments work again.
            The problem was that we no longer user file:// urls, but custom ones that start with
            attachment:.
            To fix this, we handle dragging ourselves, so we can deal with it properly and create a
            drag object that points to the actual temp file.
            
            kolab/issue3821
          ........
        ................
      ................
        r1021522 | tmcguire | 2009-09-09 15:07:20 +0200 (Wed, 09 Sep 2009) | 52 lines
        
        Block three more commits that shouldn't go into trunk which I overlooked
        SVN_MERGE
        SVN_SILENT
        Blocked revisions 1016357,1019454,1021301 via svnmerge
        
        ................
          r1016357 | winterz | 2009-08-27 17:43:25 +0200 (Thu, 27 Aug 2009) | 10 lines
          
          Merged revisions 1015867 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015867 | tmcguire | 2009-08-26 09:28:09 -0400 (Wed, 26 Aug 2009) | 3 lines
            
            Fix another regression: Display images inline again.
            MERGE: e4 (already in trunk)
          ........
        ................
          r1019454 | winterz | 2009-09-03 19:02:22 +0200 (Thu, 03 Sep 2009) | 16 lines
          
          Merged revisions 1019450 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019450 | winterz | 2009-09-03 12:56:08 -0400 (Thu, 03 Sep 2009) | 10 lines
            
            backport SVN commit 1018577 by winterz from trunk to e35:
            
            for displayView:
            + also show non-uri attachments
            + move the Calendar field prints to displayViewFormat(Event|Todo|Journal)
              instead of doing that in displayViewFormatHeader, because that screws-up
              the table row prints
            MERGE: e4
          ........
        ................
          r1021301 | winterz | 2009-09-08 21:51:08 +0200 (Tue, 08 Sep 2009) | 13 lines
          
          Merged revisions 1021298 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1021298 | winterz | 2009-09-08 15:45:53 -0400 (Tue, 08 Sep 2009) | 6 lines
            
            backport SVN commit 1021060 by winterz from trunk to e35:
            
            improve error checking and error messages for failures in editing.
            
            MERGE: e4
          ........
        ................
      ................
        r1021525 | tmcguire | 2009-09-09 15:13:42 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1015919 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015919 | winterz | 2009-08-26 17:50:34 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1015912 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
            
            fix initial sorting of the completion order entries
            kolab/issue3822
            
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021527 | tmcguire | 2009-09-09 15:18:19 +0200 (Wed, 09 Sep 2009) | 17 lines
        
        SVN_MERGE
        Merged revisions 1015921 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015921 | tmcguire | 2009-08-26 18:08:44 +0200 (Wed, 26 Aug 2009) | 9 lines
          
          Merged revisions 1015918 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015918 | tmcguire | 2009-08-26 17:50:21 +0200 (Wed, 26 Aug 2009) | 2 lines
            
            Fix the hopefully last regression with attachment handling: Handle shift-clicks correctly
          ........
        ................
      ................
        r1021532 | tmcguire | 2009-09-09 15:21:28 +0200 (Wed, 09 Sep 2009) | 21 lines
        
        SVN_SILENT
        SVN_MERGE
        Recorded merge of revisions 1015926 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015926 | winterz | 2009-08-26 18:14:40 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1015912 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
            
            fix initial sorting of the completion order entries
            kolab/issue3822
            
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021534 | tmcguire | 2009-09-09 15:24:13 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1015955 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015955 | winterz | 2009-08-26 19:01:33 +0200 (Wed, 26 Aug 2009) | 12 lines
          
          Merged revisions 1015950 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015950 | winterz | 2009-08-26 12:52:41 -0400 (Wed, 26 Aug 2009) | 5 lines
            
            make "Go to Today" work properly when in Work Week view.
            kolab/issue3671
            
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021536 | tmcguire | 2009-09-09 15:29:15 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1016356 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1016356 | winterz | 2009-08-27 17:32:40 +0200 (Thu, 27 Aug 2009) | 12 lines
          
          Merged revisions 1016353 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1016353 | winterz | 2009-08-27 11:26:36 -0400 (Thu, 27 Aug 2009) | 5 lines
            
            provide a bit more left-padding when printing
            kolab/issue3254
            
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021540 | tmcguire | 2009-09-09 15:38:31 +0200 (Wed, 09 Sep 2009) | 19 lines
        
        SVN_MERGE
        Merged revisions 1016435 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1016435 | winterz | 2009-08-27 22:01:47 +0200 (Thu, 27 Aug 2009) | 11 lines
          
          Merged revisions 1016428 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1016428 | winterz | 2009-08-27 15:56:44 -0400 (Thu, 27 Aug 2009) | 4 lines
            
            ensure that recent addresses don't get double-double-quoted
            kolab/issue3812
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021545 | tmcguire | 2009-09-09 15:42:42 +0200 (Wed, 09 Sep 2009) | 22 lines
        
        SVN_MERGE
        Merged revisions 1018372 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1018372 | winterz | 2009-09-01 18:21:34 +0200 (Tue, 01 Sep 2009) | 14 lines
          
          Merged revisions 1018368 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1018368 | winterz | 2009-09-01 12:10:27 -0400 (Tue, 01 Sep 2009) | 7 lines
            
            When decoding url's in partNodeFromXKMailUrl(), don't convert to latin1 first.
            In the calendar bodypartformatter, no longer any need to attempt
            conversion of the url to latin1 or any other encoding.
            
            fix for kolab/issue3717
            MERGE: e4,trunk
          ........
        ................
      ................
        r1021546 | tmcguire | 2009-09-09 15:45:17 +0200 (Wed, 09 Sep 2009) | 12 lines
        
        SVN_MERGE
        Merged revisions 1019122 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1019122 | winterz | 2009-09-03 00:28:18 +0200 (Thu, 03 Sep 2009) | 4 lines
          
          improve menu text for adding/removing timezones
          MERGE: trunk
          DO_NOT_BACKPORT: 4.3 due to new i18n strings
        ........
      ................
        r1021549 | tmcguire | 2009-09-09 15:48:31 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1019476 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1019476 | winterz | 2009-09-03 19:56:11 +0200 (Thu, 03 Sep 2009) | 12 lines
          
          Merged revisions 1019474 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019474 | winterz | 2009-09-03 13:53:14 -0400 (Thu, 03 Sep 2009) | 5 lines
            
            don't always set the alarm on for new to-dos.
            should be the final fix for kolab/issue3788
            
            MERGE: e4,trunk
          ........
        ................
      ................
        r1021551 | tmcguire | 2009-09-09 15:50:53 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1019556 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1019556 | winterz | 2009-09-03 23:10:46 +0200 (Thu, 03 Sep 2009) | 12 lines
          
          Merged revisions 1019553 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019553 | winterz | 2009-09-03 16:55:24 -0400 (Thu, 03 Sep 2009) | 5 lines
            
            Volker's patch for missing LDAP sources in the completion list.
            for kolab/issue3827
            
            MERGE: e4,trunk,4.3
          ........
        ................
      ................
        r1021553 | tmcguire | 2009-09-09 15:54:44 +0200 (Wed, 09 Sep 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1019831 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1019831 | winterz | 2009-09-04 16:59:28 +0200 (Fri, 04 Sep 2009) | 12 lines
          
          Merged revisions 1019828 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019828 | winterz | 2009-09-04 10:49:59 -0400 (Fri, 04 Sep 2009) | 5 lines
            
            make sure authorization dialogs are shown on top.
            fixes kolab/issue3799
            
            MERGE:e4,trunk,4.3
          ........
        ................
      ................
        r1021561 | tokoe | 2009-09-09 16:20:53 +0200 (Wed, 09 Sep 2009) | 5 lines
        
        Allow to select all contacts from a given address book
        or address book folder.
        
        BUG: 206299
      ................
        r1021580 | yurchor | 2009-09-09 17:07:06 +0200 (Wed, 09 Sep 2009) | 1 line
        
        Typo fix
      ................
        r1021591 | tmcguire | 2009-09-09 18:04:29 +0200 (Wed, 09 Sep 2009) | 4 lines
        
        Don't be Expandable by default, because then it crashes by default because the fieldname is empty
        by default.
        This can happen when using the plain header style and there are more than 4 addressees.
      ................
        r1021657 | tnyblom | 2009-09-09 20:25:18 +0200 (Wed, 09 Sep 2009) | 4 lines
        
        Restore the original bcc field when resending (send again).
        
        BUG: 176590
      ................
        r1021698 | mkoller | 2009-09-09 22:43:39 +0200 (Wed, 09 Sep 2009) | 4 lines
        
        BUG: 98553
        
        Add account name to error dialog text
      ................
        r1021821 | vkrause | 2009-09-10 09:20:07 +0200 (Thu, 10 Sep 2009) | 4 lines
        
        Guard payload() calls and get rid of the no longer needed typedef.
        
        BUG: 206254 
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1021829
      7036a2ba
  33. 09 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · fd6ff92a
      Volker Krause authored
      Merged revisions 1021110,1021115,1021163-1021165,1021210,1021235 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1021110 | tnyblom | 2009-09-08 10:03:45 +0200 (Tue, 08 Sep 2009) | 2 lines
        
        Readd renamed files
      ........
        r1021115 | scripty | 2009-09-08 10:38:06 +0200 (Tue, 08 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1021163 | mlaurent | 2009-09-08 13:29:36 +0200 (Tue, 08 Sep 2009) | 2 lines
        
        Fix iterator
      ........
        r1021164 | mlaurent | 2009-09-08 13:34:01 +0200 (Tue, 08 Sep 2009) | 2 lines
        
        Fix iterator
      ........
        r1021165 | mlaurent | 2009-09-08 13:34:56 +0200 (Tue, 08 Sep 2009) | 2 lines
        
        Fix iterator
      ........
        r1021210 | ervin | 2009-09-08 16:34:44 +0200 (Tue, 08 Sep 2009) | 2 lines
        
        Add support for Observer2 with the move semantic.
      ........
        r1021235 | lueck | 2009-09-08 17:37:09 +0200 (Tue, 08 Sep 2009) | 1 line
        
        add a desktop file for kontact-admin documentation to make it visible in khelpcenters navigation tree
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1021440
      fd6ff92a