1. 17 Nov, 2010 2 commits
  2. 08 Oct, 2010 1 commit
  3. 04 Oct, 2010 1 commit
  4. 30 Aug, 2010 1 commit
    • Volker Krause's avatar
      Merged revisions 1169244 via svnmerge from · 2133abbf
      Volker Krause authored
      svn+ssh://vkrause@svn.kde.org/home/kde/branches/KDE/4.5/kdepim
      
      ........
        r1169244 | tilladam | 2010-08-28 21:36:47 +0200 (Sat, 28 Aug 2010) | 8 lines
        
        Avoid unnecessary collection tree syncs.
        
        When a folder is modified that contains email, but is a parent of kolab
        groupware folders (such as the INBOX), treat it as the structural node
        in the kolab collection tree that it is, instead of a suddenly appeared
        new kolab folder. To that end, don't just check if the folder is the
        folder-type annotation, also make sure it's not "mail", to tell kolab
        folders from structural ones.
      ........
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1169897
      2133abbf
  5. 29 Jul, 2010 2 commits
  6. 12 Jul, 2010 1 commit
  7. 05 Jul, 2010 1 commit
    • Volker Krause's avatar
      SVN_MERGE · c60a512d
      Volker Krause authored
      Merged revisions 1137754,1141284 via svnmerge from 
      svn+ssh://vkrause@svn.kde.org/home/kde/branches/work/komo/kdepim
      
      ........
        r1137754 | vkrause | 2010-06-14 10:10:31 +0200 (Mon, 14 Jun 2010) | 2 lines
        
        remove one useless extra level of folder hierarchy
      ........
        r1141284 | vkrause | 2010-06-22 14:28:42 +0200 (Tue, 22 Jun 2010) | 2 lines
        
        fix collection naming to avoid duplicates on in root
      ........
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1146352
      c60a512d
  8. 24 Jun, 2010 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 9c9c93b0
      Volker Krause authored
      Merged revisions 1141695-1141696,1141700,1141712,1141721,1141727,1141729,1141734,1141771,1141774-1141775,1141790,1141847,1141854,1141863,1141884-1141885,1141911,1141940,1141969,1142146 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1141695 | vkrause | 2010-06-23 11:22:38 +0200 (Wed, 23 Jun 2010) | 4 lines
        
        Remove one of our kdgantt copies. This one is outdated (komo branch has
        a much newer version), unused in kdepim and is also no longer referenced
        via svn:external from koffice.
      ................
        r1141696 | mlaurent | 2010-06-23 11:23:32 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Don't show collectionstatisticanimation when not necessary ( for example when we want to "jump to folder" etc.)
      ................
        r1141700 | mlaurent | 2010-06-23 11:40:12 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Fix UseDistinctSelectionModel bug reported by Till
      ................
        r1141712 | mlaurent | 2010-06-23 12:11:42 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Restore config when we change kmail layout
      ................
        r1141721 | thiago | 2010-06-23 12:32:59 +0200 (Wed, 23 Jun 2010) | 4 lines
        
        If kjots isn't being built, turn it off.
        
        Otherwise the compilation will fail due to kontact trying to build
        its kjots plugin
      ................
        r1141727 | smartins | 2010-06-23 12:47:22 +0200 (Wed, 23 Jun 2010) | 3 lines
        
        SVN_SILENT:
        Move the assert inside the if.
      ................
        r1141729 | mlaurent | 2010-06-23 12:54:01 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        const'ify
      ................
        r1141734 | cgiboudeaux | 2010-06-23 13:11:40 +0200 (Wed, 23 Jun 2010) | 1 line
        
        Revert r1141720. Nonsensical commit. If Grantlee_FOUND is false, BUILD_kjots isn't defined at all.
      ................
        r1141771 | smartins | 2010-06-23 14:56:59 +0200 (Wed, 23 Jun 2010) | 11 lines
        
        When chosing "both" while resolving a conflict, the incidencehandler would insert
        into m_uidMap an entry with wrong info: the map key was the new incidence's uid, but the map value contained
        the old item's id, not the new one.
        
        We don't even know what the new item id is going to be because we are adding it to imap right now, so we
        just wait for itemsAdded SIGNAL and process it then.
        
        Was causing a crash in Akonadi::Calendar
        
        MERGE: none
      ................
        r1141774 | mlaurent | 2010-06-23 15:04:06 +0200 (Wed, 23 Jun 2010) | 3 lines
        
        Readd LastSelectedFolder as in kmail1 
        CCMAIL: adam@kde.org
      ................
        r1141775 | mlaurent | 2010-06-23 15:10:03 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Don't save last selected folder when we don't use global settings
      ................
        r1141790 | lfranchi | 2010-06-23 15:57:30 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        When mails fail to be dispatched, mark them queued and to be dispatched manually, otherwise, the user can never send them again.
      ................
        r1141847 | mlaurent | 2010-06-23 18:40:34 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        const'ify
      ................
        r1141854 | lfranchi | 2010-06-23 19:01:03 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Revert 1138275 for Casey.
      ................
        r1141863 | tokoe | 2010-06-23 19:33:58 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        Fix the enable/disable of 'New Contact (Group)' actions
      ................
        r1141884 | winterz | 2010-06-23 20:30:39 +0200 (Wed, 23 Jun 2010) | 12 lines
        
        SVN_SILENT:
        Blocked revisions 1140784 via svnmerge
        
        ........
          r1140784 | winterz | 2010-06-21 10:07:56 -0400 (Mon, 21 Jun 2010) | 5 lines
          
          revert the hack for removing a trailing 0 from the attachment.
          might be breaking zip files.
          kolab/issue4407
          MERGE: none
        ........
      ................
        r1141885 | winterz | 2010-06-23 20:31:24 +0200 (Wed, 23 Jun 2010) | 9 lines
        
        SVN_SILENT:
        Blocked revisions 1140723 via svnmerge
        
        ........
          r1140723 | ludwigreiter | 2010-06-21 08:06:16 -0400 (Mon, 21 Jun 2010) | 1 line
          
          Update after test of newslog 2010-06-18
        ........
      ................
        r1141911 | lfranchi | 2010-06-23 21:52:50 +0200 (Wed, 23 Jun 2010) | 2 lines
        
        For filters that move to a folder, try twice to get a valid collection for folder id, as when filter is created it might not be ready yet.
      ................
        r1141940 | tilladam | 2010-06-23 23:08:44 +0200 (Wed, 23 Jun 2010) | 1 line
        
        Be less verbose.
      ................
        r1141969 | lfranchi | 2010-06-24 00:14:00 +0200 (Thu, 24 Jun 2010) | 2 lines
        
        Read spam flags in message status too.
      ................
        r1142146 | aholzammer | 2010-06-24 10:09:17 +0200 (Thu, 24 Jun 2010) | 1 line
        
        - merged export from branch
      ................
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1142174
      9c9c93b0
  9. 23 Jun, 2010 2 commits
  10. 22 Jun, 2010 1 commit
  11. 16 Jun, 2010 1 commit
    • Stephen Kelly's avatar
      Merged revisions... · 591ae0c4
      Stephen Kelly authored
      Merged revisions 1138275,1138278,1138288,1138290-1138291,1138305,1138312-1138314,1138325,1138337-1138338,1138356,1138363,1138365-1138366,1138369,1138371,1138375-1138378,1138380,1138382,1138385,1138390,1138394,1138397,1138402,1138404,1138559,1138566,1138568-1138570,1138572,1138581,1138587,1138597-1138598,1138611-1138612,1138616-1138617,1138623,1138631-1138632 via svnmerge from 
      svn+ssh://skelly@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1138275 | link | 2010-06-15 16:28:52 +0200 (Tue, 15 Jun 2010) | 4 lines
        
        warning "unused variable ‘job’" --> looks like a connect() is missing. Please verify.
        
        CCMAIL: amantia@kde.org
        CCMAIL: kde-pim@kde.org
      ................
        r1138278 | link | 2010-06-15 16:49:33 +0200 (Tue, 15 Jun 2010) | 1 line
        
        warnings--
      ................
        r1138288 | skelly | 2010-06-15 17:38:57 +0200 (Tue, 15 Jun 2010) | 1 line
        
        Fix the patches.
      ................
        r1138290 | mlaurent | 2010-06-15 17:46:27 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Fix potential crash
      ................
        r1138291 | smartins | 2010-06-15 18:07:25 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Don't crash if the item was deleted while being changed.
      ................
        r1138305 | smartins | 2010-06-15 18:46:53 +0200 (Tue, 15 Jun 2010) | 11 lines
        
        SVN_SILENT:
        Blocked revisions 1138304 via svnmerge
        
        ........
          r1138304 | smartins | 2010-06-15 16:43:53 +0000 (Tue, 15 Jun 2010) | 4 lines
          
          korg part must be loaded, otherwise when starting kontact on summary view it won't display our stuff.
          
          Fixes kolab/issue4032
        ........
      ................
        r1138312 | skelly | 2010-06-15 19:02:07 +0200 (Tue, 15 Jun 2010) | 3 lines
        
        Make it possible to rename both books and pages.
        
        The strings "Rename page" and "Page title" already exist in the application.
      ................
        r1138313 | skelly | 2010-06-15 19:02:10 +0200 (Tue, 15 Jun 2010) | 1 line
        
        Make it possible to copy links for both books and pages.
      ................
        r1138314 | skelly | 2010-06-15 19:02:11 +0200 (Tue, 15 Jun 2010) | 1 line
        
        Set both the name and displayAttribute of collections when editing them.
      ................
        r1138325 | mlaurent | 2010-06-15 19:56:15 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Try to reimplement mail notification
      ................
        r1138337 | winterz | 2010-06-15 20:12:36 +0200 (Tue, 15 Jun 2010) | 16 lines
        
        SVN_SILENT:
        Blocked revisions 1138292,1138332 via svnmerge
        
        ........
          r1138292 | winterz | 2010-06-15 12:13:43 -0400 (Tue, 15 Jun 2010) | 4 lines
          
          avoid a possible crash in saveSettings by ensuring that the splitters
          sizes have the correct number of entries.
          MERGE: none
        ........
          r1138332 | winterz | 2010-06-15 14:03:17 -0400 (Tue, 15 Jun 2010) | 3 lines
          
          better fixing for the splitter save/restore to avoid crashes.
          MERGE: none
        ........
      ................
        r1138338 | winterz | 2010-06-15 20:13:30 +0200 (Tue, 15 Jun 2010) | 17 lines
        
        SVN_SILENT:
        Blocked revisions 1138304,1138316 via svnmerge
        
        ........
          r1138304 | smartins | 2010-06-15 12:43:53 -0400 (Tue, 15 Jun 2010) | 4 lines
          
          korg part must be loaded, otherwise when starting kontact on summary view it won't display our stuff.
          
          Fixes kolab/issue4032
        ........
          r1138316 | smartins | 2010-06-15 13:06:15 -0400 (Tue, 15 Jun 2010) | 4 lines
          
          SVN_SILENT:
          
          wether -> whether
        ........
      ................
        r1138356 | smartins | 2010-06-15 22:17:54 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        include kcalprefs.h in incidencechanger.cpp explicitly and remove it from calendarAdaptor's header file.
      ................
        r1138363 | smartins | 2010-06-15 22:43:07 +0200 (Tue, 15 Jun 2010) | 6 lines
        
        KResources--
        
        Port todo summary widget to akonadi.
        
        MERGE: none
      ................
        r1138365 | smartins | 2010-06-15 22:46:55 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Use another session name.
      ................
        r1138366 | smartins | 2010-06-15 22:49:22 +0200 (Tue, 15 Jun 2010) | 4 lines
        
        SVN_SILENT:
        
        Remove TODO comment.
      ................
        r1138369 | smartins | 2010-06-15 22:58:14 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Fix signal/slot so popup appears.
      ................
        r1138371 | golnazn | 2010-06-15 23:00:10 +0200 (Tue, 15 Jun 2010) | 1 line
        
        BUG: 226560 Remove trailing slashes from the blog url, before attaching "xmlrpc.php" at the end of it.
      ................
        r1138375 | smartins | 2010-06-15 23:13:21 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Add some default parameters.
      ................
        r1138376 | smartins | 2010-06-15 23:14:54 +0200 (Tue, 15 Jun 2010) | 4 lines
        
        Don't call korganizer.deleteIncidence() through DBUS, we don't need korganizer now.
        
        We have akonadi.
      ................
        r1138377 | smartins | 2010-06-15 23:18:44 +0200 (Tue, 15 Jun 2010) | 4 lines
        
        SVN_SILENT:
        
        constify
      ................
        r1138378 | smartins | 2010-06-15 23:22:20 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Don't delete items twice.
      ................
        r1138380 | smartins | 2010-06-15 23:26:51 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Add //TODO:
      ................
        r1138382 | smartins | 2010-06-15 23:34:47 +0200 (Tue, 15 Jun 2010) | 2 lines
        
        Remove duplicated line
      ................
        r1138385 | smartins | 2010-06-15 23:43:18 +0200 (Tue, 15 Jun 2010) | 5 lines
        
        Re-order includes.
        
        First kdepim/akonadi then kdepimlibs/akonadi
      ................
        r1138390 | smartins | 2010-06-16 00:02:19 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Port the upcoming events widget to akonadi.
        
        KResources--
      ................
        r1138394 | smartins | 2010-06-16 00:08:49 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Don't call korganizer.deleteIncidence() through DBUS... we don't need the korganizer interface now.
        
        We have akonadi.
      ................
        r1138397 | smartins | 2010-06-16 00:21:39 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Removed unused/deprecated calendarLoaded()/calendarSaved signals
        
        MERGE: none
      ................
        r1138402 | djarvie | 2010-06-16 01:13:13 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Rename KCalEvent::Status -> KACalEvent::Type
        Rename KCalEvent::Statuses -> KACalEvent::Types
        Rename KCalEvent -> KACalEvent
      ................
        r1138404 | smartins | 2010-06-16 01:40:59 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Don't crash because a collection doesn't have EntityDisplayAttribute set.
        
        Like the birthday resource.
      ................
        r1138559 | mlaurent | 2010-06-16 10:37:02 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Clean mail
      ................
        r1138566 | smartins | 2010-06-16 11:07:26 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Don't allow to set a collection default if it doesn't have rights to create items.
      ................
        r1138568 | mlaurent | 2010-06-16 11:13:31 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Minor fix
      ................
        r1138569 | smartins | 2010-06-16 11:15:09 +0200 (Wed, 16 Jun 2010) | 3 lines
        
        Someone removed the create item right, so the collection stops being the default calendar until
        user gives it proper rights.
      ................
        r1138570 | smartins | 2010-06-16 11:19:49 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Don't add Incidence in a collection without create item rights.
      ................
        r1138572 | smartins | 2010-06-16 11:28:47 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        s/TodoSummaryWidget/ApptSummaryWidget
        
        and remove const& from Akonadi::Item::Id, it's just qint64
      ................
        r1138581 | mlaurent | 2010-06-16 11:54:54 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        use setDynamicSortFilter
      ................
        r1138587 | mlaurent | 2010-06-16 12:04:22 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Minor optimization
      ................
        r1138597 | smartins | 2010-06-16 12:18:51 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Don't delete or change without proper rights.
      ................
        r1138598 | smartins | 2010-06-16 12:12:36 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Added FIXME.
      ................
        r1138611 | smartins | 2010-06-16 12:45:21 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        Anniversary icon wasn't being displayed because code assumed Anniversary as a sub-case if birthday.
        
        At least in trunk, incidences either have ANNIVERSARY or BIRTHDAY custom property, not both.
      ................
        r1138612 | smartins | 2010-06-16 12:49:03 +0200 (Wed, 16 Jun 2010) | 4 lines
        
        SVN_SILENT:
        
        Copy commit r1138611 to calendarviews.
      ................
        r1138616 | mlaurent | 2010-06-16 13:04:37 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Allow to manual sorting
      ................
        r1138617 | mlaurent | 2010-06-16 13:06:28 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        use setDynamicSortFilter
      ................
        r1138623 | smartins | 2010-06-16 13:19:30 +0200 (Wed, 16 Jun 2010) | 5 lines
        
        Create the item modify job so the incidence is actually modified.
        
        Mark to-do completed now works.
      ................
        r1138631 | smartins | 2010-06-16 13:29:51 +0200 (Wed, 16 Jun 2010) | 6 lines
        
        Editing items now works.
        
        We must pass the item id, not the incidence uid anymore.
        
        MERGE: none
      ................
        r1138632 | smartins | 2010-06-16 13:42:09 +0200 (Wed, 16 Jun 2010) | 2 lines
        
        Rename uid to itemId, so it's clear it's not incidence->uid() that we want here.
      ................
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1138635
      591ae0c4
  12. 15 Jun, 2010 2 commits
  13. 14 Jun, 2010 1 commit
  14. 25 May, 2010 3 commits
    • Volker Krause's avatar
      SVN_MERGE · 05d7efe8
      Volker Krause authored
      Merged revisions 1130409,1130419,1130422-1130423,1130425,1130427-1130428,1130454,1130460,1130462,1130465,1130468,1130480-1130481,1130485,1130487 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1130409 | smartins | 2010-05-25 11:49:10 +0200 (Tue, 25 May 2010) | 2 lines
        
        Don't crash when cutting only the parent todo.
      ........
        r1130419 | tokoe | 2010-05-25 12:08:13 +0200 (Tue, 25 May 2010) | 2 lines
        
        fix signal/slot connection
      ........
        r1130422 | tokoe | 2010-05-25 12:04:09 +0200 (Tue, 25 May 2010) | 2 lines
        
        Fix signal/slot connection
      ........
        r1130423 | smartins | 2010-05-25 12:11:35 +0200 (Tue, 25 May 2010) | 2 lines
        
        Ported dragging to-dos to a parent to akonadi. Must fix some refresh issues.
      ........
        r1130425 | tokoe | 2010-05-25 12:17:11 +0200 (Tue, 25 May 2010) | 2 lines
        
        Make classes explicit to allow static code analysis
      ........
        r1130427 | tokoe | 2010-05-25 12:20:32 +0200 (Tue, 25 May 2010) | 2 lines
        
        Use explicit classes to allow static code analysis
      ........
        r1130428 | tokoe | 2010-05-25 12:25:58 +0200 (Tue, 25 May 2010) | 2 lines
        
        code cleanup
      ........
        r1130454 | smartins | 2010-05-25 14:28:34 +0200 (Tue, 25 May 2010) | 2 lines
        
        Make it possible to unselect an item because if there's an item selected when we paste it will be pasted under a parent and not independent.
      ........
        r1130460 | mlaurent | 2010-05-25 14:38:13 +0200 (Tue, 25 May 2010) | 2 lines
        
        Fix enable/disable "keep reply in this folder"
      ........
        r1130462 | mlaurent | 2010-05-25 14:54:23 +0200 (Tue, 25 May 2010) | 2 lines
        
        Cleanup
      ........
        r1130465 | vkrause | 2010-05-25 15:22:54 +0200 (Tue, 25 May 2010) | 3 lines
        
        load the error attribute as well if available, otherwise transport
        errors are not displayed
      ........
        r1130468 | smartins | 2010-05-25 15:31:54 +0200 (Tue, 25 May 2010) | 9 lines
        
        Created function: bool IncidenceChanger::canDelete( Akonadi::Item::Id id )
        
        Returns false if there is or there was a running delete job for that item id.
        
        Will solve problems where the user presses "Del" twice and that triggers two delete jobs, one of which will result in an error.
        
        This is also better than asking the model because the ETM will still hold the item for some milisecs after the delete job ends.
      ........
        r1130480 | mlaurent | 2010-05-25 15:59:09 +0200 (Tue, 25 May 2010) | 2 lines
        
        Start to reimplement sort manualy collection
      ........
        r1130481 | krake | 2010-05-25 15:57:33 +0200 (Tue, 25 May 2010) | 2 lines
        
        Implement folder config and related filter config migration in collection migrator base and adapt existing specializations
      ........
        r1130485 | smartins | 2010-05-25 16:09:11 +0200 (Tue, 25 May 2010) | 2 lines
        
        Renamed canDelete() so it's more explicit what it does.
      ........
        r1130487 | smartins | 2010-05-25 16:14:18 +0200 (Tue, 25 May 2010) | 2 lines
        
        Fix bug where the user deleted the incidence twice
      ........
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1130501
      05d7efe8
    • Tobias Koenig's avatar
      Fix signal/slot connection · 93a4d1db
      Tobias Koenig authored
      svn path=/trunk/KDE/kdepim/runtime/; revision=1130422
      93a4d1db
    • Tobias Koenig's avatar
      fix signal/slot connection · f1a2c21a
      Tobias Koenig authored
      svn path=/trunk/KDE/kdepim/runtime/; revision=1130419
      f1a2c21a
  15. 15 May, 2010 1 commit
  16. 22 Apr, 2010 1 commit
  17. 11 Dec, 2009 2 commits
  18. 03 Dec, 2009 1 commit
  19. 21 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 448bfa1a
      Volker Krause authored
      Merged revisions 1037928,1037963,1037965,1037996,1038046,1038050,1038058,1038060,1038076,1038084,1038126,1038204-1038205,1038255,1038266,1038268,1038288,1038298,1038321,1038335,1038346,1038348 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1037928 | scripty | 2009-10-20 11:37:15 +0200 (Tue, 20 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1037963 | skelly | 2009-10-20 12:27:41 +0200 (Tue, 20 Oct 2009) | 1 line
        
        Rename internal virtual to make grep happier.
      ................
        r1037965 | skelly | 2009-10-20 12:28:06 +0200 (Tue, 20 Oct 2009) | 1 line
        
        Update for changes in kdepimlibs/akonadi.
      ................
        r1037996 | vkrause | 2009-10-20 14:46:09 +0200 (Tue, 20 Oct 2009) | 2 lines
        
        Merge changes from akonadi/agents/nepomukfeederagent into this copy.
      ................
        r1038046 | tokoe | 2009-10-20 16:47:12 +0200 (Tue, 20 Oct 2009) | 2 lines
        
        Link with gold
      ................
        r1038050 | tokoe | 2009-10-20 16:53:52 +0200 (Tue, 20 Oct 2009) | 2 lines
        
        Link with gold
      ................
        r1038058 | tokoe | 2009-10-20 17:08:30 +0200 (Tue, 20 Oct 2009) | 2 lines
        
        Adapt to latest kdepimlibs
      ................
        r1038060 | tokoe | 2009-10-20 17:10:44 +0200 (Tue, 20 Oct 2009) | 2 lines
        
        SVN_SILENT: link against KDEUI is enough
      ................
        r1038076 | tmcguire | 2009-10-20 17:50:38 +0200 (Tue, 20 Oct 2009) | 1 line
        
        Follow kdepimlibs API change.
      ................
        r1038084 | tmcguire | 2009-10-20 18:02:17 +0200 (Tue, 20 Oct 2009) | 1 line
        
        Use the new method from kdepimlibs
      ................
        r1038126 | cgiboudeaux | 2009-10-20 19:11:45 +0200 (Tue, 20 Oct 2009) | 1 line
        
        nepomukfeederagentbase.cpp needs some strigi includes. we must look for it.
      ................
        r1038204 | winterz | 2009-10-20 22:04:50 +0200 (Tue, 20 Oct 2009) | 20 lines
        
        Merged revisions 1038122 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1038122 | winterz | 2009-10-20 13:01:00 -0400 (Tue, 20 Oct 2009) | 13 lines
          
          Merged revisions 1038105 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1038105 | winterz | 2009-10-20 12:27:50 -0400 (Tue, 20 Oct 2009) | 6 lines
            
            implement our own context menu for opening and saving invitation attachments.
            kolab/issue3923
            
            MERGE: e4,trunk
            DO_NOT_BACKPORT: new i18n strings
          ........
        ................
      ................
        r1038205 | winterz | 2009-10-20 22:06:07 +0200 (Tue, 20 Oct 2009) | 10 lines
        
        Recorded merge of revisions 1038201 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        SVN_SILENT:
        
        ........
          r1038201 | winterz | 2009-10-20 16:04:30 -0400 (Tue, 20 Oct 2009) | 3 lines
          
          fix i18n
        ........
      ................
        r1038255 | winterz | 2009-10-20 23:56:15 +0200 (Tue, 20 Oct 2009) | 4 lines
        
        pretty, pretty icons for the invitation attachment context menu.
        MERGE: none
      ................
        r1038266 | djarvie | 2009-10-21 00:31:42 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        Add option for audio-only alarms, i.e. without an associated alarm window.
      ................
        r1038268 | djarvie | 2009-10-21 00:47:31 +0200 (Wed, 21 Oct 2009) | 1 line
        
        Improve menu organisation
      ................
        r1038288 | pokrzywka | 2009-10-21 02:03:47 +0200 (Wed, 21 Oct 2009) | 1 line
        
        --warning
      ................
        r1038298 | pokrzywka | 2009-10-21 03:00:42 +0200 (Wed, 21 Oct 2009) | 1 line
        
        s/class/struct, fixes the build with msvc
      ................
        r1038321 | aalvarez | 2009-10-21 05:17:51 +0200 (Wed, 21 Oct 2009) | 3 lines
        
        - Remove boost dependency by using KMime::Message::Ptr and KCal::Incidence::Ptr.
        - use setParentCollection() instead of setParent, as it is now deprecated.
      ................
        r1038335 | tokoe | 2009-10-21 07:22:09 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        Adapt to new FavoriteCollectionsModel ctor
      ................
        r1038346 | mlaurent | 2009-10-21 08:27:09 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        Fix iterator
      ................
        r1038348 | vkrause | 2009-10-21 08:33:56 +0200 (Wed, 21 Oct 2009) | 2 lines
        
        Fix test, apparently it's int not integer.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1038442
      448bfa1a
  20. 08 Oct, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · f87b6511
      Volker Krause authored
      Merged revisions 1032223,1032248,1032358,1032369,1032414,1032510-1032511 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1032223 | scripty | 2009-10-07 12:10:58 +0200 (Wed, 07 Oct 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1032248 | lueck | 2009-10-07 13:43:02 +0200 (Wed, 07 Oct 2009) | 1 line
        
        Karm was renamed to KTimeTracker
      ........
        r1032358 | vkrause | 2009-10-07 18:02:41 +0200 (Wed, 07 Oct 2009) | 4 lines
        
        While ItemCreateJob cannot yet handle collections identified by their
        RID CollectionFetchJob can, which gives a massive speed-up compared to
        a full recursive listing for every new item.
      ........
        r1032369 | vkrause | 2009-10-07 18:28:31 +0200 (Wed, 07 Oct 2009) | 2 lines
        
        also don't index stuff that's newly added but hidden
      ........
        r1032414 | djarvie | 2009-10-07 20:48:17 +0200 (Wed, 07 Oct 2009) | 4 lines
        
        Fix recurring date-only alarm triggering repeatedly and eating up CPU, when the
        start of day time is after midnight and the alarm is due, but the current time of
        day in UTC is earlier than the start-of-day time of day in the alarm's time zone.
      ........
        r1032510 | winterz | 2009-10-08 02:23:52 +0200 (Thu, 08 Oct 2009) | 5 lines
        
        revert back to r1024583.
        unfortunately, there is no way to know what summaries are available until
        they are created by the plugin itself.
      ........
        r1032511 | winterz | 2009-10-08 02:25:31 +0200 (Thu, 08 Oct 2009) | 3 lines
        
        put back the minimally expanding spaceritems below the last summary in each column.
        an attempt to keep the last summary from stretching and looking strange.
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1032557
      f87b6511
  21. 25 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · ec1fcc2d
      Volker Krause authored
      Merged revisions 1026999,1027019,1027023,1027084,1027138,1027147,1027168-1027169,1027187,1027192-1027193,1027223,1027225-1027229,1027244,1027261,1027267,1027545,1027554-1027555,1027582,1027595,1027625,1027642,1027674,1027697,1027720,1027723,1027764,1027769,1027783,1027811,1027840,1027913,1027919,1027924 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1026999 | vkrause | 2009-09-23 10:47:26 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Don't confuse me like this.
      ................
        r1027019 | tmcguire | 2009-09-23 11:34:03 +0200 (Wed, 23 Sep 2009) | 20 lines
        
        Doesn't apply here, we don't have order on arrival sort order.
        SVN_MERGE
        SVN_SILENT
        Blocked revisions 1027012 via svnmerge
        
        ................
          r1027012 | tmcguire | 2009-09-23 11:32:17 +0200 (Wed, 23 Sep 2009) | 11 lines
          
          Merged revisions 1027006 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1027006 | tmcguire | 2009-09-23 11:14:52 +0200 (Wed, 23 Sep 2009) | 4 lines
            
            Don't change the sort order when closing the configure dialog.
            
            Fixes kolab/issue3806
          ........
        ................
      ................
        r1027023 | tokoe | 2009-09-23 11:35:05 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Add actions to configure toolbar, shortcuts and preferences
      ................
        r1027084 | tokoe | 2009-09-23 12:02:04 +0200 (Wed, 23 Sep 2009) | 4 lines
        
        Remember splitter sizes and column positions over restart
        
        BUG: 208252
      ................
        r1027138 | tmcguire | 2009-09-23 13:28:46 +0200 (Wed, 23 Sep 2009) | 8 lines
        
        Don't pass a "New" template context, when in reality we are editing a message.
        This fixes invitation sending, which would get sent as empty messages.
        
        We desparately need invitation stuff to be automatically tested, maybe after the akonadi
        port...
        
        No need to backport.
      ................
        r1027147 | vkrause | 2009-09-23 13:49:25 +0200 (Wed, 23 Sep 2009) | 3 lines
        
        Update tag names and icons in Nepomuk when the corresponding virtual
        collection has been changed.
      ................
        r1027168 | tokoe | 2009-09-23 15:04:43 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Set default value for contacts directory
      ................
        r1027169 | tokoe | 2009-09-23 15:05:59 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Add menu entry to configure the address book resource
      ................
        r1027187 | helio | 2009-09-23 15:59:34 +0200 (Wed, 23 Sep 2009) | 1 line
        
        - Remove oxygen icons to avoid duplication. Missing ones are added in the oxygen repository.
      ................
        r1027192 | vkrause | 2009-09-23 16:10:04 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Don't index hidden collections.
      ................
        r1027193 | vkrause | 2009-09-23 16:12:47 +0200 (Wed, 23 Sep 2009) | 3 lines
        
        Hide Kolab groupware folders inside the IMAP resource. Also, restore the
        folder icons for them we have in KMail.
      ................
        r1027223 | tokoe | 2009-09-23 17:49:48 +0200 (Wed, 23 Sep 2009) | 2 lines
        
        Save/restore the simple gui mode correctly
      ................
        r1027225 | tmcguire | 2009-09-23 18:02:46 +0200 (Wed, 23 Sep 2009) | 27 lines
        
        SVN_MERGE
        Merged revisions 1024389 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1024389 | winterz | 2009-09-16 16:06:47 +0200 (Wed, 16 Sep 2009) | 19 lines
          
          Merged revisions 1024159 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1024159 | tmcguire | 2009-09-16 04:44:29 -0400 (Wed, 16 Sep 2009) | 12 lines
            
            When renaming a folder, make sure the reference count is correct again, i.e. open
            the folder in the syncing code, as that closes the folder later.
            
            THis fixes some issues with the message list, as the folder got closed behind
            its back.
            
            Don't clear the selected message after renaming a folder as well.
            
            Also, remove some annoying debug output when syncing.
            
            Fixes kolab/issue3853
          ........
        ................
      ................
        r1027226 | tmcguire | 2009-09-23 18:04:15 +0200 (Wed, 23 Sep 2009) | 19 lines
        
        SVN_MERGE
        Merged revisions 1024393 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1024393 | winterz | 2009-09-16 16:13:29 +0200 (Wed, 16 Sep 2009) | 11 lines
          
          Merged revisions 1024288 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1024288 | tmcguire | 2009-09-16 06:29:52 -0400 (Wed, 16 Sep 2009) | 4 lines
            
            Don't overwrite custom folder types. Treat the folder as a mail folder instead.
            
            kolab/issue2069
          ........
        ................
      ................
        r1027227 | tmcguire | 2009-09-23 18:09:07 +0200 (Wed, 23 Sep 2009) | 364 lines
        
        Block cyclic merges+blocks+release+stuff
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 1024467-1024469,1024471-1024474,1024478,1024890,1025019-1025020,1025264,1025266,1025343,1025345 via svnmerge
        
        ................
          r1024467 | tmcguire | 2009-09-16 18:25:50 +0200 (Wed, 16 Sep 2009) | 187 lines
          
          Block cyclic merges + planner
          SVN_SILENT
          Blocked revisions 1021565-1021567,1021571-1021572,1022567,1022893,1022963-1022964,1023897 via svnmerge
          
          ................
            r1021565 | tmcguire | 2009-09-09 16:24:25 +0200 (Wed, 09 Sep 2009) | 21 lines
            
            Backport r1021515 by tmcguire from trunk to the 4.3 branch:
            
            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.
              ........
            ................
          ................
            r1021566 | tmcguire | 2009-09-09 16:25:55 +0200 (Wed, 09 Sep 2009) | 23 lines
            
            Backport r1021536 by tmcguire from trunk to the 4.3 branch:
            
            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
              ........
            ................
          ................
            r1021567 | tmcguire | 2009-09-09 16:27:28 +0200 (Wed, 09 Sep 2009) | 22 lines
            
            Backport r1021540 by tmcguire from trunk to the 4.3 branch:
            
            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
              ........
            ................
          ................
            r1021571 | tmcguire | 2009-09-09 16:29:08 +0200 (Wed, 09 Sep 2009) | 23 lines
            
            Backport r1021534 by tmcguire from trunk to the 4.3 branch:
            
            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
              ........
            ................
          ................
            r1021572 | tmcguire | 2009-09-09 16:31:15 +0200 (Wed, 09 Sep 2009) | 23 lines
            
            Backport r1021553 by tmcguire from trunk to the 4.3 branch:
            
            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
              ........
            ................
          ................
            r1022567 | scripty | 2009-09-12 05:06:23 +0200 (Sat, 12 Sep 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1022893 | winterz | 2009-09-13 14:46:08 +0200 (Sun, 13 Sep 2009) | 6 lines
            
            Backport r1022892 by winterz from trunk to the 4.3 branch:
            
            fix setting wordwrap on KUrlLabels
            MERGE: 4.3
          ................
            r1022963 | tmcguire | 2009-09-13 18:18:14 +0200 (Sun, 13 Sep 2009) | 25 lines
            
            Backport r1022953 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1021531 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1021531 | winterz | 2009-09-09 15:19:32 +0200 (Wed, 09 Sep 2009) | 14 lines
              
              Merged revisions 1021458 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1021458 | tmcguire | 2009-09-09 05:16:29 -0400 (Wed, 09 Sep 2009) | 7 lines
                
                After adding a locally added message to the server, don't put it in the deletion map.
                
                Should fix kolab/issue3833.
                
                However, there are some stale deletion maps because of this bug, I need to think of a clever
                way to get rid of them...
              ........
            ................
          ................
            r1022964 | tmcguire | 2009-09-13 18:18:57 +0200 (Sun, 13 Sep 2009) | 22 lines
            
            Backport r1022954 by tmcguire from trunk to the 4.3 branch:
            
            Merged revisions 1021533 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1021533 | winterz | 2009-09-09 15:21:33 +0200 (Wed, 09 Sep 2009) | 12 lines
              
              Merged revisions 1021464 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1021464 | tmcguire | 2009-09-09 05:37:52 -0400 (Wed, 09 Sep 2009) | 5 lines
                
                When there is nothing to delete, clear the deletion map, as it might have stale  entries
                resulting from kolab/issue3833.
                
                Part of kolab/issue3833
              ........
            ................
          ................
            r1023897 | winterz | 2009-09-15 16:13:00 +0200 (Tue, 15 Sep 2009) | 2 lines
            
            revert mistaken commits
          ................
        ................
          r1024468 | tmcguire | 2009-09-16 18:27:25 +0200 (Wed, 16 Sep 2009) | 15 lines
          
          Merged revisions 1021563 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1021563 | tmcguire | 2009-09-09 16:22:31 +0200 (Wed, 09 Sep 2009) | 9 lines
            
            Backport r1020615 by tmcguire from trunk to the 4.3 branch:
            
            Don't get the full message when deleting it, just the KMsgBase.
            
            This could fix a giant memory leak reported by Jaime.
            Or this could just explode into my face.
            With the message storage system, you never know.
          ........
        ................
          r1024469 | tmcguire | 2009-09-16 18:30:06 +0200 (Wed, 16 Sep 2009) | 10 lines
          
          SVN_SILENT already merged by Allen
          Recorded merge of revisions 1022069 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1022069 | tnyblom | 2009-09-10 19:45:39 +0200 (Thu, 10 Sep 2009) | 2 lines
            
            Backport crash guard from trunk
          ........
        ................
          r1024471 | tmcguire | 2009-09-16 18:32:15 +0200 (Wed, 16 Sep 2009) | 11 lines
          
          SVN_SILENT too many conflicts, and we don't really use GMX export here anyway
          Blocked revisions 1022098 via svnmerge
          
          ........
            r1022098 | winterz | 2009-09-10 21:53:59 +0200 (Thu, 10 Sep 2009) | 4 lines
            
            apply Urs' patch that refines the export of addresses from/to GMX.
            Should be in trunk already.
            CCMAIL: tschenturs@gmx.ch
          ........
        ................
          r1024472 | tmcguire | 2009-09-16 18:34:45 +0200 (Wed, 16 Sep 2009) | 13 lines
          
          SVN_SILENT the folder tree has been rewritten, so patch does not apply
          Blocked revisions 1022456 via svnmerge
          
          ........
            r1022456 | mkoller | 2009-09-11 22:04:35 +0200 (Fri, 11 Sep 2009) | 7 lines
            
            Backport r1022455 by mkoller from trunk to the 4.3 branch:
            
            CCBUG: 207028
            
            fix display of unread message count in right-to-left language
          ........
        ................
          r1024473 | tmcguire | 2009-09-16 18:36:41 +0200 (Wed, 16 Sep 2009) | 15 lines
          
          Merged revisions 1023466 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1023466 | wstephens | 2009-09-14 21:19:51 +0200 (Mon, 14 Sep 2009) | 8 lines
            
            Backport r1023461 - fix restore of always show matched 'download later'
            message setting (https://bugzilla.novell.com/show_bug.cgi?id=471760).
            
            Thomas, I forgot to CC you on the original commit, CCing you know in
            case you want this for a branch.
            
            CCMAIL: mcguire@kde.org
          ........
        ................
          r1024474 | tmcguire | 2009-09-16 18:38:47 +0200 (Wed, 16 Sep 2009) | 12 lines
          
          Merged revisions 1023576 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1023576 | winterz | 2009-09-15 01:24:44 +0200 (Tue, 15 Sep 2009) | 5 lines
            
            Backport r1023565 by tmcguire from trunk to the 4.3 branch:
            
            Return the correct timespec for UTC and floating.
            Now all day events in KOrganizer don't disappear anymore after editing.
          ........
        ................
          r1024478 | tmcguire | 2009-09-16 18:42:37 +0200 (Wed, 16 Sep 2009) | 10 lines
          
          Merged revisions 1023689 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1023689 | dfaure | 2009-09-15 11:09:08 +0200 (Tue, 15 Sep 2009) | 3 lines
            
            You must call plugActionList again in slotNewToolbarConfig, otherwise the action lists disappear.
            BUG: 207299
          ........
        ................
          r1024890 | winterz | 2009-09-17 15:37:08 +0200 (Thu, 17 Sep 2009) | 12 lines
          
          Merged revisions 1024886 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1024886 | winterz | 2009-09-17 09:28:13 -0400 (Thu, 17 Sep 2009) | 6 lines
            
            crash fix for dealing with in-line attachments.
            kolab/issue3865
            
            MERGE: e4 (maybe, need to take a closer look. definitely block trunk)
          ........
        ................
          r1025019 | winterz | 2009-09-17 22:11:18 +0200 (Thu, 17 Sep 2009) | 9 lines
          
          Blocked revisions 1024957 via svnmerge
          
          ........
            r1024957 | winterz | 2009-09-17 13:15:58 -0400 (Thu, 17 Sep 2009) | 3 lines
            
            fix a crash
            MERGE: e4,trunk,4.3
          ........
        ................
          r1025020 | winterz | 2009-09-17 22:12:12 +0200 (Thu, 17 Sep 2009) | 9 lines
          
          Blocked revisions 1025016 via svnmerge
          
          ........
            r1025016 | winterz | 2009-09-17 16:06:10 -0400 (Thu, 17 Sep 2009) | 3 lines
            
            add Nuno's new icons for calendar holidays
            MERGE: e4
          ........
        ................
          r1025264 | tmcguire | 2009-09-18 11:27:33 +0200 (Fri, 18 Sep 2009) | 1 line
          
          Update Newslog.txt.
        ................
          r1025266 | tmcguire | 2009-09-18 11:27:48 +0200 (Fri, 18 Sep 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1025343 | winterz | 2009-09-18 15:18:28 +0200 (Fri, 18 Sep 2009) | 12 lines
          
          Blocked revisions 1025243,1025265 via svnmerge
          
          ........
            r1025243 | tmcguire | 2009-09-18 05:17:06 -0400 (Fri, 18 Sep 2009) | 1 line
            
            Update Newslog.txt
          ........
            r1025265 | tmcguire | 2009-09-18 05:27:46 -0400 (Fri, 18 Sep 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1025345 | winterz | 2009-09-18 15:28:12 +0200 (Fri, 18 Sep 2009) | 8 lines
          
          Blocked revisions 1025208 via svnmerge
          
          ........
            r1025208 | tmcguire | 2009-09-18 04:58:12 -0400 (Fri, 18 Sep 2009) | 2 lines
            
            Add context for those poor translators.
          ........
        ................
      ................
        r1027228 | tmcguire | 2009-09-23 18:10:05 +0200 (Wed, 23 Sep 2009) | 18 lines
        
        SVN_MERGE
        Merged revisions 1025188 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1025188 | tmcguire | 2009-09-18 10:48:53 +0200 (Fri, 18 Sep 2009) | 10 lines
          
          Merged revisions 1025159 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1025159 | tmcguire | 2009-09-18 10:22:08 +0200 (Fri, 18 Sep 2009) | 3 lines
            
            Fix regression that the shared seen flag was not saved for the inbox.
            kolab/issue3830
          ........
        ................
      ................
        r1027229 | tmcguire | 2009-09-23 18:12:34 +0200 (Wed, 23 Sep 2009) | 12 lines
        
        commit already here, it seems.
        SVN_MERGE
        SVN_SILENT
        Blocked revisions 1026526 via svnmerge
        
        ........
          r1026526 | winterz | 2009-09-22 01:35:12 +0200 (Tue, 22 Sep 2009) | 3 lines
          
          use the new view-calendar icon instead of view-pim-calendar
          when showing the folder type in the folder list.
        ........
      ................
        r1027244 | tstaerk | 2009-09-23 18:44:07 +0200 (Wed, 23 Sep 2009) | 1 line
        
        Make the help clearer.
      ................
        r1027261 | tmcguire | 2009-09-23 19:20:02 +0200 (Wed, 23 Sep 2009) | 3 lines
        
        Better also set the start and end time spec for floating events.
        MERGE: 4.3, e4
      ................
        r1027267 | tmcguire | 2009-09-23 19:37:33 +0200 (Wed, 23 Sep 2009) | 3 lines
        
        Add Quoted message option to insert command in custom templates.
        Patch by Josef Reidinger <jreidinger at suse dot cz>, thanks :)
      ................
        r1027545 | scripty | 2009-09-24 11:35:45 +0200 (Thu, 24 Sep 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ................
        r1027554 | tokoe | 2009-09-24 11:51:02 +0200 (Thu, 24 Sep 2009) | 3 lines
        
        Moved LDAPOptionsWidget into a KCM, so it can be shown
        in the settings dialog of KAddressBook and Kontact.
      ................
        r1027555 | vkrause | 2009-09-24 11:51:25 +0200 (Thu, 24 Sep 2009) | 4 lines
        
        Move Kolab specific code out of the IMAP resource. Kolab folders are now
        only hidden when a Kolab resource is active, which makes more sense
        anyway.
      ................
        r1027582 | tstaerk | 2009-09-24 13:22:37 +0200 (Thu, 24 Sep 2009) | 3 lines
        
        Make the EditTAskDiaLog editable via qtcreator. Implement that a task
        has several events, not one overall time.
      ................
        r1027595 | tstaerk | 2009-09-24 13:48:22 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Get historywidget to the front; improve whatsthis help; code cleanup.
      ................
        r1027625 | tstaerk | 2009-09-24 14:07:19 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Improve whatsthis-help.
      ................
        r1027642 | tstaerk | 2009-09-24 14:32:40 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Preview for autotracking in edittaskdialog
      ................
        r1027674 | skelly | 2009-09-24 15:43:26 +0200 (Thu, 24 Sep 2009) | 4 lines
        
        Make the drag-expand hack a bit more clear.
        
        The problem is that QTreeView toggles the expand/collapse state of indexes on drag-over, so
        we need to override it.
      ................
        r1027697 | vkrause | 2009-09-24 15:52:47 +0200 (Thu, 24 Sep 2009) | 6 lines
        
        Monitor the Nepomuk interface and disable the feeder agents as long as it
        is not available. This also fixes the race between starting the Nepomuk
        server and checking for its availability. Side-effect: as long as you
        have Nepomuk feeder agent instances configured in Akonadi, the Nepomuk
        server is virtually unkillable.
      ................
        r1027720 | sengels | 2009-09-24 17:40:38 +0200 (Thu, 24 Sep 2009) | 1 line
        
        ifdef warning macro
      ................
        r1027723 | djarvie | 2009-09-24 17:51:57 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Update mime type
      ................
        r1027764 | tstaerk | 2009-09-24 19:58:33 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Allow the user to delete events, major code cleanup.
      ................
        r1027769 | tstaerk | 2009-09-24 20:28:00 +0200 (Thu, 24 Sep 2009) | 1 line
        
        karmstorage -> timetrackerstorage (major code cleanup)
      ................
        r1027783 | tstaerk | 2009-09-24 21:09:02 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Display window title of editTAskDiaLog; code cleanup.
      ................
        r1027811 | tstaerk | 2009-09-24 22:14:49 +0200 (Thu, 24 Sep 2009) | 1 line
        
        compiler warnings--
      ................
        r1027840 | tstaerk | 2009-09-24 23:34:43 +0200 (Thu, 24 Sep 2009) | 1 line
        
        Removing old stuff.
      ................
        r1027913 | tstaerk | 2009-09-25 08:25:18 +0200 (Fri, 25 Sep 2009) | 1 line
        
        Opening bracket should be in same line or column as closing bracket. Removed TODO remark that has been done with the last commit.
      ................
        r1027919 | vkrause | 2009-09-25 09:06:46 +0200 (Fri, 25 Sep 2009) | 2 lines
        
        adapt to changes in EntityDisplayAttribute
      ................
        r1027924 | vkrause | 2009-09-25 09:54:04 +0200 (Fri, 25 Sep 2009) | 4 lines
        
        Add a method to include other scripts. Works perfectly for KJS but only
        partially for QtScript (I can't call functions defined in the included
        script there).
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1027972
      ec1fcc2d
  22. 04 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_SILENT · 38491d1a
      Volker Krause authored
      Merged revisions 1019225,1019366,1019382,1019407-1019408,1019413,1019418,1019448,1019457,1019460,1019478,1019616 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1019225 | ervin | 2009-09-03 10:53:25 +0200 (Thu, 03 Sep 2009) | 3 lines
        
        Attempt to start IDLE only when we're done with the first connection.
        This way we're sure that the result of CAPABILITY is known.
      ................
        r1019366 | winterz | 2009-09-03 13:46:27 +0200 (Thu, 03 Sep 2009) | 11 lines
        
        Recorded merge of revisions 1019359 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1019359 | winterz | 2009-09-03 07:41:57 -0400 (Thu, 03 Sep 2009) | 5 lines
          
          merge SVN commit 1017761 by thiago from trunk to e4:
          
          Don't crash if currentItem is 0
        ........
      ................
        r1019382 | ervin | 2009-09-03 14:27:11 +0200 (Thu, 03 Sep 2009) | 10 lines
        
        The ImapAccount needs to live longer so that it's inner session is done
        processing the queued event coming from the logout and disconnect
        triggered on login error.
        
        So don't delete immediately, schedule for deletion and make sure the
        ImapResource doesn't listen to it anymore.
        
        BUG: 205480
      ................
        r1019407 | winterz | 2009-09-03 16:23:56 +0200 (Thu, 03 Sep 2009) | 21 lines
        
        Recorded merge of revisions 1019405 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1019405 | winterz | 2009-09-03 10:22:00 -0400 (Thu, 03 Sep 2009) | 14 lines
          
          Merged revisions 1019400 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1019400 | winterz | 2009-09-03 10:03:23 -0400 (Thu, 03 Sep 2009) | 7 lines
            
            backport SVN commit 1017820 by winterz from trunk to e35:
            
            Provide a new toolTipStr() and extensiveDisplayStr() that print the Incidence's calendar.
            Deprecate the old toolTipStr() and extensiveDisplayStr().
            
            MERGE: e4
          ........
        ................
      ................
        r1019408 | ervin | 2009-09-03 16:39:04 +0200 (Thu, 03 Sep 2009) | 3 lines
        
        Fix ACL handling. When Create or Delete is set you don't need to set any
        of the more specific flags.
      ................
        r1019413 | vkrause | 2009-09-03 16:52:06 +0200 (Thu, 03 Sep 2009) | 5 lines
        
        - don't hang on error
        - don't delete the local folder if we failed to create it remotely, it
          might contain valuable mails by now
        - slightly improved error message
      ................
        r1019418 | vkrause | 2009-09-03 17:02:48 +0200 (Thu, 03 Sep 2009) | 3 lines
        
        - forward moves of Kolab objects to IMAP
        - some cleanups
      ................
        r1019448 | winterz | 2009-09-03 18:47:49 +0200 (Thu, 03 Sep 2009) | 12 lines
        
        Recorded merge of revisions 1019445 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1019445 | winterz | 2009-09-03 12:44:09 -0400 (Thu, 03 Sep 2009) | 5 lines
          
          merge SVN commit 1017853 by winterz from trunk to e4:
          
          follow the new IncidenceFormatter methods that put the Calendar name in
          the tooltip and displayView
        ........
      ................
        r1019457 | vkrause | 2009-09-03 19:12:23 +0200 (Thu, 03 Sep 2009) | 5 lines
        
        Monitor IMAP for moves and propagate them to Kolab.
        
        Doesn't work completely yet, due to CollectionMoveJob not handling
        destination collections only identified by a RID correctly.
      ................
        r1019460 | tokoe | 2009-09-03 19:23:56 +0200 (Thu, 03 Sep 2009) | 4 lines
        
        Use a file name instead of a URL for the base path.
        
        BUG: 205742
      ................
        r1019478 | tokoe | 2009-09-03 19:59:08 +0200 (Thu, 03 Sep 2009) | 5 lines
        
        Disable KAddressBooks Ctrl+N shortcut, since Kontact uses
        this shortcut itself
        
        BUG: 204099
      ................
        r1019616 | djarvie | 2009-09-04 04:39:48 +0200 (Fri, 04 Sep 2009) | 2 lines
        
        Fix mime types
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1019640
      38491d1a
  23. 26 Aug, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 99d430f7
      Volker Krause authored
      Merged revisions 1015512,1015553,1015561,1015616,1015665,1015827 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1015512 | bbigras | 2009-08-25 20:01:46 +0200 (Tue, 25 Aug 2009) | 4 lines
        
        Revert "workaround : without showProgressInfo=false, the kiojob remain open forever with https link"
        It seem the problem was fixed in KRun
        
        CCBUG: 198671
      ................
        r1015553 | mkoller | 2009-08-25 22:51:59 +0200 (Tue, 25 Aug 2009) | 5 lines
        
        BUG: 166922
        
        When not printing from kmail's separate reader window, use the font
        specified in the font settings.
      ................
        r1015561 | winterz | 2009-08-25 23:22:13 +0200 (Tue, 25 Aug 2009) | 4 lines
        
        fix crash that can happen when editing a to-do.
        BUG: 205067
        MERGE: 4.3
      ................
        r1015616 | finex | 2009-08-26 01:26:30 +0200 (Wed, 26 Aug 2009) | 5 lines
        
        Disable autoformatting when rich text is off.
        
        BUG: 203321
      ................
        r1015665 | tmcguire | 2009-08-26 09:47:03 +0200 (Wed, 26 Aug 2009) | 25 lines
        
        SVN_SILENT
        SVN_MERGE
        Recorded merge of revisions 1015194 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1015194 | winterz | 2009-08-24 23:12:47 +0200 (Mon, 24 Aug 2009) | 16 lines
          
          Merged revisions 1015185 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1015185 | winterz | 2009-08-24 16:04:54 -0400 (Mon, 24 Aug 2009) | 9 lines
            
            reverse the order of the buttons
            
            from left to right, the button order is now:
            [Dismiss Reminder] [Dismiss All] [Edit...] [Suspend]
            
            kolab/issue3808
            MERGE: e4, trunk 
            DO_NOT_BACKPORT: 4.3
          ........
        ................
      ................
        r1015827 | vkrause | 2009-08-26 14:16:26 +0200 (Wed, 26 Aug 2009) | 3 lines
        
        Let KMime do the message assembly for us, that way we always end up with
        a valid message.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1015835
      99d430f7
  24. 14 Jul, 2009 1 commit
  25. 13 Jul, 2009 1 commit
    • Volker Krause's avatar
      SVN_SILENT · 33a22d1c
      Volker Krause authored
      Merged revisions 995800,995950 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r995800 | skelly | 2009-07-13 14:24:13 +0200 (Mon, 13 Jul 2009) | 1 line
        
        Use the correct row in mapToSource. Fixes bug introduced in r995710.
      ........
        r995950 | vkrause | 2009-07-13 16:57:00 +0200 (Mon, 13 Jul 2009) | 3 lines
        
        Fix an assert when we try to update a Kolab item for which we do not
        find a corresponding IMAP item for whatever reason.
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=995953
      33a22d1c
  26. 26 Jun, 2009 1 commit
  27. 22 Jun, 2009 1 commit
  28. 21 Jun, 2009 3 commits
  29. 19 Jun, 2009 2 commits
  30. 18 Jun, 2009 1 commit
    • Volker Krause's avatar
      - Build a collection tree similar to the source collection tree we are · 297508fa
      Volker Krause authored
        operating on. This fixes eg. name conflicts when using shared folders.
        Path contraction is still missing though, which will make the tree
        less complex by removing unnecessary structural collections inbetween.
      - Fix collection change propagation in various cases.
      - Deal with too complex changes on the IMAP side and errors by simply
        resyncing the entire collection tree.
      - Use the correct collection content mimetypes.
      - Set Kolab folder type annotations on collections we create on the
        IMAP side.
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=983627
      297508fa