1. 10 Dec, 2014 1 commit
  2. 06 May, 2013 1 commit
  3. 12 Jul, 2010 1 commit
  4. 21 Jun, 2010 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 0ce9a944
      Volker Krause authored
      Merged revisions 1139491,1139493,1139509,1139511,1139513,1139516-1139517,1139525,1139541,1139582,1139588,1139591,1139594,1139615,1139617,1139621,1139631,1139642,1139662,1139665,1139672-1139674,1139678,1139687-1139688,1139925,1139953,1139956,1139960,1140064-1140065,1140068,1140071,1140073,1140079-1140080,1140085-1140087,1140154,1140325-1140326 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1139491 | mlaurent | 2010-06-18 14:15:26 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        readd setShowImap/setShowOutbox
      ................
        r1139493 | mlaurent | 2010-06-18 14:35:37 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Hide outbox folder when we create a filter
      ................
        r1139509 | mlaurent | 2010-06-18 15:50:50 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Use Akonadi::MessageFolderAttribute
      ................
        r1139511 | smartins | 2010-06-18 15:54:12 +0200 (Fri, 18 Jun 2010) | 5 lines
        
        todo/appt/specialdates no longer use KResources so i'm moving stdcalendar.{h,cpp} to planner, it's only user.
        
        This also gets rid of hundreds of compiler deprectated warnings when compiling kontact, because planner isn't compiled by default.
      ................
        r1139513 | mlaurent | 2010-06-18 16:00:36 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Migrate whofield
      ................
        r1139516 | tmcguire | 2010-06-18 16:05:38 +0200 (Fri, 18 Jun 2010) | 3 lines
        
        When changing the identity, change the crypto format as well
        
        This is a forwardport of r1139515.
      ................
        r1139517 | mlaurent | 2010-06-18 16:08:33 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Bye bye WhoField but need to implement whofield when empty 
      ................
        r1139525 | tmcguire | 2010-06-18 16:47:06 +0200 (Fri, 18 Jun 2010) | 11 lines
        
        SVN_SILENT:
        Blocked revisions 1139524 via svnmerge
        
        ........
          r1139524 | tmcguire | 2010-06-18 16:42:32 +0200 (Fri, 18 Jun 2010) | 4 lines
          
          Fix memory leak.
          
          Also, don't modify the mMsgList here, that was just asking for trouble.
        ........
      ................
        r1139541 | tmcguire | 2010-06-18 17:31:56 +0200 (Fri, 18 Jun 2010) | 13 lines
        
        Already correct here.
        SVN_SILENT:
        Blocked revisions 1139536 via svnmerge
        
        ........
          r1139536 | tmcguire | 2010-06-18 17:20:39 +0200 (Fri, 18 Jun 2010) | 5 lines
          
          Make those translatable.
          
          kolab/issue4419
          MERGE: trunk
        ........
      ................
        r1139582 | smartins | 2010-06-18 18:17:14 +0200 (Fri, 18 Jun 2010) | 13 lines
        
        SVN_SILENT:
        Blocked revisions 1139581 via svnmerge
        
        ........
          r1139581 | smartins | 2010-06-18 16:15:55 +0000 (Fri, 18 Jun 2010) | 7 lines
          
          SVN_SILENT:
          
          Style fix while trying to understand this code.
          
          That if-else style makes my head hurt.
        ........
      ................
        r1139588 | mlaurent | 2010-06-18 18:33:16 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Reimplement isOutBoundFolder when whofield is empty as in kmail1
      ................
        r1139591 | mlaurent | 2010-06-18 18:40:03 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        this code was ported now
      ................
        r1139594 | mlaurent | 2010-06-18 18:48:28 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        not necessary to change collection attribute all the time
      ................
        r1139615 | lfranchi | 2010-06-18 20:23:29 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Fix signing with wrong S/MIME cert when multiple are valid for given email address.
      ................
        r1139617 | lfranchi | 2010-06-18 20:27:36 +0200 (Fri, 18 Jun 2010) | 2 lines
        
        Fix test, no longer test invalid implementation detail
      ................
        r1139621 | tilladam | 2010-06-18 20:58:21 +0200 (Fri, 18 Jun 2010) | 6 lines
        
        Trigger the extra info retrieval jobs via the resource scheduler.
        
        Use custom tasks, to trigger the retrieval of acl, rights, quota and
        annotations, that way they don't block incoming fetches, which the
        user wants to be processed with priority, as everything is nicely
        queued and prioritized by the scheduler.
      ................
        r1139631 | vkrause | 2010-06-18 21:45:17 +0200 (Fri, 18 Jun 2010) | 4 lines
        
        Avoid a whole bunch of unecessary IMAP SELECT commands, gives us about
        50% speedup for retrieving mails and even more for flag changes with high
        latency connections.
      ................
        r1139642 | tilladam | 2010-06-18 22:39:48 +0200 (Fri, 18 Jun 2010) | 1 line
        
        Don't trigger extra info retrieval for noselect folders.
      ................
        r1139662 | vkrause | 2010-06-18 23:40:55 +0200 (Fri, 18 Jun 2010) | 3 lines
        
        Splitting an empty QByteArray gives you an non-empty list.
        This avoids whitespace ping-pong changes on IMAP ACL attributes.
      ................
        r1139665 | winterz | 2010-06-19 00:04:29 +0200 (Sat, 19 Jun 2010) | 2 lines
        
        planner should be ported. it worked in 4.4.
      ................
        r1139672 | asouza | 2010-06-19 00:54:47 +0200 (Sat, 19 Jun 2010) | 6 lines
        
        Update tests to follow new API
        
        Remove brackets and call to "second class" methods (the ones
        ending with an 'a'), and call the proper methods.
      ................
        r1139673 | asouza | 2010-06-19 00:57:01 +0200 (Sat, 19 Jun 2010) | 8 lines
        
        Update QML files dealing with i18n methods
        
        The API of the KDE integration plugin changed and removed
        the methods ending with 'a's. Now we have the same API as
        the c++ for i18n methods and deal with more than one arguments
        on the plugin slots.
      ................
        r1139674 | asouza | 2010-06-19 01:03:59 +0200 (Sat, 19 Jun 2010) | 17 lines
        
        Remove extra i18n methods from kde plugin for qml
        
        Making the slot's arguments be a QScriptValue var we
        are able to access the QML's engine and then have access
        to the context where the code is running.
        
        With the context in hands, we are able to know the number
        of arguments the js method was called and are able to parse
        each one of them, calling the proper c++ overloaded method.
        
        This is a workaround for not being able to directly get the
        context (or engine) from QML. Another option would be to make
        the plugin inherit QScriptable and thus we would have access
        to the environment where this object was exported to, but this
        doesn't work as QML doesn't use QtScript's mechanisms to create
        and call methods.
      ................
        r1139678 | winterz | 2010-06-19 01:12:22 +0200 (Sat, 19 Jun 2010) | 13 lines
        
        SVN_SILENT:
        Blocked revisions 1139547-1139548 via svnmerge
        
        ........
          r1139547 | tmcguire | 2010-06-18 11:44:33 -0400 (Fri, 18 Jun 2010) | 1 line
          
          Update Newslog.txt
        ........
          r1139548 | tmcguire | 2010-06-18 11:45:40 -0400 (Fri, 18 Jun 2010) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ........
      ................
        r1139687 | krake | 2010-06-19 01:55:52 +0200 (Sat, 19 Jun 2010) | 2 lines
        
        Improve status reporting: when we are finished migrating but have background tasks running, show for how many we are waiting for
      ................
        r1139688 | krake | 2010-06-19 02:05:55 +0200 (Sat, 19 Jun 2010) | 2 lines
        
        When  importing messages, show how many messages are still to be processed.
      ................
        r1139925 | tokoe | 2010-06-19 15:04:04 +0200 (Sat, 19 Jun 2010) | 5 lines
        
        Do not forward the 'return pressed' signal of the url
        selector to the 'Ok' button of the dialog.
        
        BUG: 242063
      ................
        r1139953 | mlaurent | 2010-06-19 18:13:16 +0200 (Sat, 19 Jun 2010) | 3 lines
        
        Now migrate kolab attributes.
        (need more tests)
      ................
        r1139956 | mlaurent | 2010-06-19 18:20:04 +0200 (Sat, 19 Jun 2010) | 2 lines
        
        Need to register attributes
      ................
        r1139960 | mlaurent | 2010-06-19 18:43:08 +0200 (Sat, 19 Jun 2010) | 2 lines
        
        Add debug
      ................
        r1140064 | smartins | 2010-06-19 19:26:49 +0200 (Sat, 19 Jun 2010) | 12 lines
        
        SVN_MERGE:
        Merged revisions 1131183 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1131183 | smartins | 2010-05-27 15:09:16 +0000 (Thu, 27 May 2010) | 4 lines
          
          Added option to control whether the view is interactive ( supports editing and context menu ) or not, so we can reuse it in the preview dialog.
          
          For kolab/issue397
        ........
      ................
        r1140065 | smartins | 2010-06-19 19:37:25 +0200 (Sat, 19 Jun 2010) | 11 lines
        
        Recorded merge of revisions 1131183 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1131183 | smartins | 2010-05-27 15:09:16 +0000 (Thu, 27 May 2010) | 4 lines
          
          Added option to control whether the view is interactive ( supports editing and context menu ) or not, so we can reuse it in the preview dialog.
          
          For kolab/issue397
        ........
      ................
        r1140068 | smartins | 2010-06-19 19:42:58 +0200 (Sat, 19 Jun 2010) | 6 lines
        
        SVN_MERGE:
        
        remove 2 unused members from class.
        
        MERGE: trunk
      ................
        r1140071 | smartins | 2010-06-19 19:47:03 +0200 (Sat, 19 Jun 2010) | 12 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1139597 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1139597 | smartins | 2010-06-18 17:08:18 +0000 (Fri, 18 Jun 2010) | 4 lines
          
          remove 2 unused members from class.
          
          MERGE: trunk
        ........
      ................
        r1140073 | smartins | 2010-06-19 20:05:21 +0200 (Sat, 19 Jun 2010) | 6 lines
        
        SVN_SILENT:
        
        Merge of commit r1139607.
        
        Will to the record when i put this in calendarviews.
      ................
        r1140079 | smartins | 2010-06-19 20:26:41 +0200 (Sat, 19 Jun 2010) | 3 lines
        
        SVN_SILENT:
        Merge of commit r1139607.
      ................
        r1140080 | smartins | 2010-06-19 20:28:40 +0200 (Sat, 19 Jun 2010) | 26 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1139607,1139613 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1139607 | smartins | 2010-06-18 17:44:47 +0000 (Fri, 18 Jun 2010) | 10 lines
          
          Added mItemPos and mItemCount to KOAgendaItem, so we know which part of the multi-day incidence this Item refers to.
          
          With these two ints it's easier than traveling prev/next/first/last pointers that aren't even reliable because they can be 0 if agenda
          is only showing part of it, for example in day view.
          
          
          Progress for kolab/issue4417
          
          MERGE: trunk
        ........
          r1139613 | smartins | 2010-06-18 18:14:52 +0000 (Fri, 18 Jun 2010) | 6 lines
          
          SVN_SILENT:
          
          Updated the debug statement to also print the new members.
          
          MERGE: trunk
        ........
      ................
        r1140085 | smartins | 2010-06-19 20:36:06 +0200 (Sat, 19 Jun 2010) | 4 lines
        
        SVN_SILENT:
        
        Merge commit r1139624
      ................
        r1140086 | smartins | 2010-06-19 20:28:51 +0200 (Sat, 19 Jun 2010) | 19 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1139624 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1139624 | smartins | 2010-06-18 19:06:23 +0000 (Fri, 18 Jun 2010) | 11 lines
          
          Handle two special cases when resizing events with mouse:
          
          - Changing the end when start isn't visible.
          - Changing the start when end isn't visible.
          
          This bug has been here since ever and i never noticed it...
          
          fixes kolab/issue4417
          
          MERGE: trunk, 4.4
        ........
      ................
        r1140087 | smartins | 2010-06-19 20:38:33 +0200 (Sat, 19 Jun 2010) | 16 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1137845 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1137845 | smartins | 2010-06-14 13:08:06 +0000 (Mon, 14 Jun 2010) | 9 lines
          
          Backport r1137804 by smartins from trunk to e35:
          
          Only archive a completed to-do if it's children are also complete, otherwise we get a crash because of orphan to-dos.
          
          Archive now has the same behaviour as purge: purge refused to make children orphan.
          
          Won't svnmerge record this commit because it has a new string that should be fwd ported.
        ........
      ................
        r1140154 | smartins | 2010-06-20 03:44:52 +0200 (Sun, 20 Jun 2010) | 14 lines
        
        SVN_SILENT:
        Recorded merge of revisions 1140153 via svnmerge from 
        svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1140153 | smartins | 2010-06-20 01:43:45 +0000 (Sun, 20 Jun 2010) | 7 lines
          
          Backport r1140149 by smartins from branch 4.4 to e35:
          
          Don't crash when formating an incidence.
          CCBUG: 236462
          CCBUG: 242191
        ........
      ................
        r1140325 | tokoe | 2010-06-20 12:22:24 +0200 (Sun, 20 Jun 2010) | 5 lines
        
        Enabled/disable the 'New Contact' and 'New Contact Group' actions depending
        on whether there exists a writable address book
        
        BUG: 238375
      ................
        r1140326 | tokoe | 2010-06-20 12:28:02 +0200 (Sun, 20 Jun 2010) | 3 lines
        
        Disable address book related actions when all address books
        have been removed
      ................
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1140659
      0ce9a944
  5. 18 Jun, 2010 1 commit
  6. 15 May, 2010 1 commit
  7. 14 May, 2010 1 commit
  8. 22 Apr, 2010 1 commit
  9. 11 Dec, 2009 2 commits
  10. 16 Jun, 2009 1 commit
  11. 26 May, 2009 2 commits
  12. 30 Apr, 2009 2 commits
  13. 29 Apr, 2009 1 commit