1. 17 Mar, 2017 1 commit
  2. 08 Jan, 2017 1 commit
    • Daniel Vrátil's avatar
      IMAP: add support for native GMail OAuth authentication · ca4b3f09
      Daniel Vrátil authored
      This change adds support for XOAUTH2 authentication method used by
      Gmail to the IMAP resource. The XOAUTH2 support is implemented in
      a custom SASL plugin. The token request/refresh is done via KGAPI.
      
      When user sets imap.gmail.com as IMAP server in the resource config
      dialog, the dialog automatically sets all the configuration to match
      the one of Gmail and selects XOAUTH2 as authentication method. The
      access and refresh tokens are stored in KWallet like a regular
      password, but a special PasswordRequesterInterface implementation is
      used to handle the tokens and pass the right data to KIMAP::LoginJob.
      
      With this change it's no longer necessary to have the "Allow less
      secure apps" option enabled in Google Account settings and it's no
      longer necessary to use app-specific password for accounts with
      two-step verification (2FA) enabled. The actual password is no longer
      stored in KWallet and has only be typed into Google Auth form once.
      
      FEATURE: 354508
      FIXED-IN: 5.5.0
      CHANGELOG: Implement native Gmail authentication into IMAP resource
      ca4b3f09
  3. 03 Jul, 2015 1 commit
  4. 03 May, 2015 1 commit
  5. 14 Dec, 2014 1 commit
  6. 27 Aug, 2014 1 commit
  7. 10 Aug, 2014 1 commit
    • Daniel Vrátil's avatar
      Split ImapResource to ImapResourceBase and ImapResource · 2158e587
      Daniel Vrátil authored
      ImapResourceBase contains generic implementation (most of the code), and ImapResource
      contains code that links against specific classes, like configuration dialog etc.,
      which some more specialized IMAP subclasses might want to replace by their own
      implementation.
      
      Conflicts:
      	resources/imap/imapresource.cpp
      	resources/imap/imapresource.h
      2158e587
  8. 20 Jul, 2014 1 commit
  9. 19 Jun, 2014 1 commit
    • Daniel Vrátil's avatar
      Split ImapResource to ImapResourceBase and ImapResource · ced66cca
      Daniel Vrátil authored
      ImapResourceBase contains generic implementation (most of the code), and ImapResource
      contains code that links against specific classes, like configuration dialog etc.,
      which some more specialized IMAP subclasses might want to replace by their own
      implementation.
      ced66cca
  10. 22 Apr, 2014 1 commit
  11. 11 Feb, 2014 1 commit
  12. 30 Jul, 2013 1 commit
  13. 10 Jul, 2013 2 commits
  14. 13 Jan, 2012 1 commit
  15. 12 Jul, 2010 1 commit
  16. 03 Jun, 2010 6 commits
    • Volker Krause's avatar
      SVN_MERGE · 6e64b6c1
      Volker Krause authored
      Merged revisions 1134048,1134061,1134093-1134094,1134125,1134142,1134146-1134147,1134150,1134156-1134157,1134159-1134162,1134166 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1134048 | bricks | 2010-06-03 11:23:07 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        merged 1134040 into trunk
        hide akonadi resources from mac os dock
      ........
        r1134061 | krake | 2010-06-03 12:17:39 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        Fixing migration of Kolab resources.
      ........
        r1134093 | smartins | 2010-06-03 13:56:18 +0200 (Thu, 03 Jun 2010) | 5 lines
        
        Do not show events before setDates() was called, otherwise we
        see day view date for some milisecs then weekview.
      ........
        r1134094 | mlaurent | 2010-06-03 14:06:57 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        Fix migrate favorite collection
      ........
        r1134125 | smartins | 2010-06-03 15:09:21 +0200 (Thu, 03 Jun 2010) | 4 lines
        
        Don't delete all KOAgendaViews and create them again when we change an incidence.
        
        Seems overkill.
      ........
        r1134142 | lfranchi | 2010-06-03 16:16:54 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        Fix typo.
      ........
        r1134146 | link | 2010-06-03 16:26:27 +0200 (Thu, 03 Jun 2010) | 1 line
        
        imap resource: remove the trimmed() calls, because wiith the QRegExpValidator they are unnecessary
      ........
        r1134147 | link | 2010-06-03 16:26:38 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        kolab resource: change default authentication type to plain when using ssl.
        
        BUG: 240586
      ........
        r1134150 | smartins | 2010-06-03 16:29:40 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        add debug info for a crash
      ........
        r1134156 | djarvie | 2010-06-03 16:40:55 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        Refactor detection of calendar format version, to make the function available to
        Akonadi resource.
      ........
        r1134157 | smartins | 2010-06-03 16:41:27 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        More debug, we're almost there.
      ........
        r1134159 | lfranchi | 2010-06-03 16:43:28 +0200 (Thu, 03 Jun 2010) | 4 lines
        
        Properly set the right charset. If the user selects a charset, use that one first. If Force Charset is on, use that as a fallback if the user hasn't explicitly chosen another one.
        
        BUG: 238632
      ........
        r1134160 | lfranchi | 2010-06-03 16:45:01 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        initialize to false
      ........
        r1134161 | djarvie | 2010-06-03 16:46:48 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        Suppress resource-related deprecated warnings for non-Akonadi build.
      ........
        r1134162 | link | 2010-06-03 16:48:18 +0200 (Thu, 03 Jun 2010) | 11 lines
        
        Revert the automatic running of the server test.
        As ervin pointed out there are two cases where this breaks the user's expectation:
        1) user checks that default conn settings are OK and doesn't touch them
        2) later on post-initial config the user is editing an innocuous setting (e.g., mail interval)
        
        Revert "If the user manually changes the advanced connection settings, don't run the test as obviously (we hope) he/she knows what he is doing. This is all really a pre-cursor to the "Test Settings" feature. See bug 239893"
        Revert "Run the server test and change the settings appropriately before accept()ing the imap config dialog."
        Conflicts:
        
        	runtime/resources/imap/setupserver.cpp
        	runtime/resources/imap/setupserver.h
      ........
        r1134166 | amantia | 2010-06-03 16:49:53 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        Convert newlines to unix style newlines, that is what KMime expects. Fixes S/MIME decryption.
        BUG: 239901
      ........
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1134177
      6e64b6c1
    • Casey Link's avatar
      Revert the automatic running of the server test. · 4b00a6f8
      Casey Link authored
      As ervin pointed out there are two cases where this breaks the user's expectation:
      1) user checks that default conn settings are OK and doesn't touch them
      2) later on post-initial config the user is editing an innocuous setting (e.g., mail interval)
      
      Revert "If the user manually changes the advanced connection settings, don't run the test as obviously (we hope) he/she knows what he is doing. This is all really a pre-cursor to the "Test Settings" feature. See bug 239893"
      Revert "Run the server test and change the settings appropriately before accept()ing the imap config dialog."
      Conflicts:
      
      	runtime/resources/imap/setupserver.cpp
      	runtime/resources/imap/setupserver.h
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1134162
      4b00a6f8
    • Volker Krause's avatar
      SVN_MERGE · 44de7342
      Volker Krause authored
      Merged revisions 1133711,1133743-1133744,1133749,1133751,1133763,1133766-1133767,1133774,1133793,1133798,1133805,1133833,1133849,1133852,1133862,1133866,1133871,1133884,1133900,1133905,1133918,1133920,1133928,1133936,1133943,1133947-1133950,1133974-1133976,1133986-1133988,1133992-1133995,1133997,1134013 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1133711 | krake | 2010-06-02 11:11:35 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Complete change to new KMail config file kmail2rc
      ........
        r1133743 | krake | 2010-06-02 12:54:30 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        The config file name is kmail2rc now
      ........
        r1133744 | krake | 2010-06-02 13:00:13 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Check if there is an old KMail config or KMail data directory so we don't needlessly run the migrator on totally new setups
      ........
        r1133749 | smartins | 2010-06-02 13:24:05 +0200 (Wed, 02 Jun 2010) | 4 lines
        
        We don't open new windows that bypass akonadi now.
        
        BUG: 232296
      ........
        r1133751 | krake | 2010-06-02 13:30:45 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        We cannot know how long the migrator will need, we definitely cannot be sure it will be finished in 30 seconds (the default of waitForFinished)
      ........
        r1133763 | krake | 2010-06-02 14:04:54 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Data dir also changes to "kmail2" because this is the aboutdata's appname
      ........
        r1133766 | smartins | 2010-06-02 14:21:36 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Remove text/calendar mimetype from the monitor so free/busy isn't included.
      ........
        r1133767 | smartins | 2010-06-02 14:24:41 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Remove text/calendar mimetype from the monitor so free/busy isn't included.
      ........
        r1133774 | mlaurent | 2010-06-02 14:31:57 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Minor fix
      ........
        r1133793 | krake | 2010-06-02 15:45:19 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Get rid of the warnings triggered by kDebug() usage
      ........
        r1133798 | lfranchi | 2010-06-02 15:49:56 +0200 (Wed, 02 Jun 2010) | 4 lines
        
        Add Urgent headers if user selected Urget action.
        
        BUG: 238104
      ........
        r1133805 | krake | 2010-06-02 16:06:16 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Move special mail collection handling into the base class to share modify job handling with custom folder icon migration
      ........
        r1133833 | lfranchi | 2010-06-02 17:53:51 +0200 (Wed, 02 Jun 2010) | 4 lines
        
        Only enable Copy action when some text is selected in the viewer
        
        CCBUG: 223820
      ........
        r1133849 | mlaurent | 2010-06-02 18:55:56 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Add debug
      ........
        r1133852 | mlaurent | 2010-06-02 19:04:29 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Add info here. We mustn't modify kmail2rc but akonadi*resouce*
      ........
        r1133862 | smartins | 2010-06-02 19:41:11 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Remove TODO. Bug fixed by skelly.
      ........
        r1133866 | krake | 2010-06-02 19:49:09 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        If accounts have trash folders configured, set them to that special collections type
      ........
        r1133871 | smartins | 2010-06-02 19:54:09 +0200 (Wed, 02 Jun 2010) | 7 lines
        
        SVN_SILENT:
        
        Just style stuff before i commit a nice patch.
        
        Remove 4 space identation, use 2 instead.
      ........
        r1133884 | smartins | 2010-06-02 20:21:46 +0200 (Wed, 02 Jun 2010) | 9 lines
        
        
        Finally found the cause behind events not appearing at startup from time to time.
        
        Race between the model used by AkonadiCollectionView and calendarSearch's model, when the first model's selection model
        gets an item selected calendarSearch's model might not know about the collection yet.
        
        
        BUG: 237153
      ........
        r1133900 | smartins | 2010-06-02 22:04:51 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Stay quiet when parent didn't change
      ........
        r1133905 | lfranchi | 2010-06-02 22:09:46 +0200 (Wed, 02 Jun 2010) | 5 lines
        
        Make context menus a bit smarter, and show more relevant entries. Could use more cleanup too.
        
        BUG: 223480
        CCBUG: 223486
      ........
        r1133918 | smartins | 2010-06-02 22:41:49 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        Stay quiet when nothing is inserted.
      ........
        r1133920 | djarvie | 2010-06-02 22:54:24 +0200 (Wed, 02 Jun 2010) | 3 lines
        
        Fix loss of time zone specification for date only alarms when converting a
        pre-2.3.2 calendar, if start-of-day time in calendar is not midnight.
      ........
        r1133928 | lfranchi | 2010-06-02 23:31:15 +0200 (Wed, 02 Jun 2010) | 2 lines
        
        When a default collection changes, make sure our specialcollection still has one, and if not, find the newly created one.
      ........
        r1133936 | lfranchi | 2010-06-03 00:04:34 +0200 (Thu, 03 Jun 2010) | 4 lines
        
        clear cache of specialcollection folder ids when fetching new ones
        
        BUG: 1133929
      ........
        r1133943 | lfranchi | 2010-06-03 00:30:33 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        only show Move To Trash in folder context menu if selected folder is not the trash
      ........
        r1133947 | link | 2010-06-03 01:28:43 +0200 (Thu, 03 Jun 2010) | 1 line
        
        Be more forgiving of user input. Trim the server field of whitespace before working with it.
      ........
        r1133948 | link | 2010-06-03 01:28:47 +0200 (Thu, 03 Jun 2010) | 1 line
        
        trimm the email field before working with it
      ........
        r1133949 | link | 2010-06-03 01:28:50 +0200 (Thu, 03 Jun 2010) | 5 lines
        
        I don't know why, but the ecmascript interpreter kross uses does not have a trim() function
        for strings, so this commit adds one and uses it in the appropriate places. Of course since
        each script is independent it has to be added to each wizard.
        
        Trimming user input prevents many copy/paste errors.
      ........
        r1133950 | djarvie | 2010-06-03 01:31:33 +0200 (Thu, 03 Jun 2010) | 2 lines
        
        Remove unnecessary startOfDay parameter
      ........
        r1133974 | link | 2010-06-03 03:31:27 +0200 (Thu, 03 Jun 2010) | 1 line
        
        warnings--
      ........
        r1133975 | link | 2010-06-03 03:31:31 +0200 (Thu, 03 Jun 2010) | 1 line
        
        Run the server test and change the settings appropriately before accept()ing the imap config dialog.
      ........
        r1133976 | link | 2010-06-03 03:31:33 +0200 (Thu, 03 Jun 2010) | 1 line
        
        If the user manually changes the advanced connection settings, don't run the test as obviously (we hope) he/she knows what he is doing. This is all really a pre-cursor to the "Test Settings" feature. See bug 239893
      ........
        r1133986 | link | 2010-06-03 04:16:44 +0200 (Thu, 03 Jun 2010) | 1 line
        
        remove stale connect()s
      ........
        r1133987 | link | 2010-06-03 04:16:47 +0200 (Thu, 03 Jun 2010) | 1 line
        
        imap resource: Prevent two KWallet password prompts from being shown consecutively.
      ........
        r1133988 | link | 2010-06-03 04:16:50 +0200 (Thu, 03 Jun 2010) | 5 lines
        
        imap resource: Remove the passwordPossible() method because it is redundant.
        
        The password() method takes a pointer to a bool that is set if the password fetching is not possible. Besides,
        calling passwordPossible() followed by password() will result in two KWallet prompts to the user in short
        succession, which is very annoying.
      ........
        r1133992 | link | 2010-06-03 04:58:59 +0200 (Thu, 03 Jun 2010) | 1 line
        
        pop3 resource: delete the wallet pointer. memleak--
      ........
        r1133993 | link | 2010-06-03 04:59:02 +0200 (Thu, 03 Jun 2010) | 1 line
        
        pop3 resource: fix comment
      ........
        r1133994 | link | 2010-06-03 04:59:06 +0200 (Thu, 03 Jun 2010) | 1 line
        
        pop3 resource: keep the wallet open to prevent multiple password prompts when configuring the resource
      ........
        r1133995 | link | 2010-06-03 04:59:09 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        imap resource: add a validator to the imap host field
        
        doh, should have used this from the beginning!
      ........
        r1133997 | winterz | 2010-06-03 05:09:25 +0200 (Thu, 03 Jun 2010) | 5 lines
        
        forward port SVN commit 1133996 by winterz:
        
        change the Exec command to use --encrypt-sign rather than --sign-encrypt
        CCBUG: 240536
      ........
        r1134013 | tokoe | 2010-06-03 08:14:27 +0200 (Thu, 03 Jun 2010) | 3 lines
        
        Copy hasMyWritableEventsFolders from KCal::CalHelper, since
        bodypart formatter is the only user
      ........
      
      svn path=/branches/work/komo/kdepim/runtime/; revision=1134025
      44de7342
    • Casey Link's avatar
      imap resource: add a validator to the imap host field · 8458af6a
      Casey Link authored
      doh, should have used this from the beginning!
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1133995
      8458af6a
    • Casey Link's avatar
      If the user manually changes the advanced connection settings, don't run the... · 8d75b216
      Casey Link authored
      If the user manually changes the advanced connection settings, don't run the test as obviously (we hope) he/she knows what he is doing. This is all really a pre-cursor to the "Test Settings" feature. See bug 239893
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1133976
      8d75b216
    • Casey Link's avatar
      Run the server test and change the settings appropriately before accept()ing... · 91c6ee71
      Casey Link authored
      Run the server test and change the settings appropriately before accept()ing the imap config dialog.
      
      svn path=/trunk/KDE/kdepim/runtime/; revision=1133975
      91c6ee71
  17. 15 May, 2010 1 commit
  18. 13 May, 2010 1 commit
  19. 27 Apr, 2010 1 commit
  20. 22 Apr, 2010 1 commit
  21. 20 Apr, 2010 1 commit
  22. 05 Apr, 2010 1 commit
  23. 03 Apr, 2010 3 commits
  24. 31 Mar, 2010 1 commit
  25. 04 Jan, 2010 1 commit
  26. 11 Dec, 2009 2 commits
  27. 10 Dec, 2009 1 commit
  28. 08 Dec, 2009 1 commit
  29. 02 Dec, 2009 1 commit
  30. 27 Nov, 2009 1 commit
  31. 23 Sep, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 9ed78ca7
      Volker Krause authored
      Merged revisions 1026675,1026680,1026683-1026684,1026707,1026711,1026721,1026727,1026729,1026732,1026736,1026755,1026758,1026761,1026766,1026812-1026813,1026815,1026848,1026926,1026928,1026992 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1026675 | vkrause | 2009-09-22 10:27:19 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Change the remaining handcoded queries to use the SPARQL query builder.
      ................
        r1026680 | vkrause | 2009-09-22 10:37:05 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        oops, unbreak incremental updates
      ................
        r1026683 | cgiboudeaux | 2009-09-22 10:52:37 +0200 (Tue, 22 Sep 2009) | 1 line
        
        include SopranoAddOntology (req. by nie_fast)
      ................
        r1026684 | vkrause | 2009-09-22 10:57:31 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Add some status reporting, less aggressive initial scan.
      ................
        r1026707 | vkrause | 2009-09-22 11:15:31 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Stop creating a massive amount of empty Nepomuk Contact resources.
      ................
        r1026711 | vkrause | 2009-09-22 12:00:08 +0200 (Tue, 22 Sep 2009) | 3 lines
        
        - set correct lables on contacts if they don't have a name
        - only set the actual mail content once
      ................
        r1026721 | vkrause | 2009-09-22 12:50:56 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        oops
      ................
        r1026727 | vkrause | 2009-09-22 13:41:07 +0200 (Tue, 22 Sep 2009) | 4 lines
        
        - Try to start Nepomuk if it's not yet running.
        - Check if Nepomuk with a working backend is available, otherwise
          disable the feeder agents and warn the user.
      ................
        r1026729 | vkrause | 2009-09-22 13:47:28 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Don't index links.
      ................
        r1026732 | vkrause | 2009-09-22 13:56:29 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Avoid usage of Nepomuk[NonFast]::Resource here.
      ................
        r1026736 | vkrause | 2009-09-22 14:22:34 +0200 (Tue, 22 Sep 2009) | 3 lines
        
        Mailody can assign icons to tags, of course we need to support that here
        as well :)
      ................
        r1026755 | vkrause | 2009-09-22 16:07:51 +0200 (Tue, 22 Sep 2009) | 5 lines
        
        IMAP can't do incremental folder listing, so don't tell Akonadi
        otherwise. This propagates remote folder deletions now, as well as
        updates the tree correctly after enabling server side subscriptions.
        So, no need to recreate the cache in that case.
      ................
        r1026758 | djarvie | 2009-09-22 16:13:07 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Cater for different alarm calendar types
      ................
        r1026761 | tokoe | 2009-09-22 16:26:57 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Setup the default action handler
      ................
        r1026766 | vkrause | 2009-09-22 16:34:05 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        Allow to enable server side subscriptions in the config dialog.
      ................
        r1026812 | dfaure | 2009-09-22 18:41:53 +0200 (Tue, 22 Sep 2009) | 3 lines
        
        Don't mess up the CMAKE_MODULE_PATH when this is configured as part of kdepim, and the toplevel cmakelists already found soprano and nepomuk.
        By resetting it, we were losing the location of SopranoAddOntology.cmake, when kdesupport (or just soprano) is in its own prefix.
      ................
        r1026813 | cgiboudeaux | 2009-09-22 18:46:59 +0200 (Tue, 22 Sep 2009) | 1 line
        
        kdepim-runtime can use Soprano. Let's look for it
      ................
        r1026815 | dfaure | 2009-09-22 18:57:17 +0200 (Tue, 22 Sep 2009) | 2 lines
        
        krop's commit fixes my problem in a better way, reverting
      ................
        r1026848 | winterz | 2009-09-22 20:26:45 +0200 (Tue, 22 Sep 2009) | 17 lines
        
        Merged revisions 1026837 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1026837 | winterz | 2009-09-22 14:04:14 -0400 (Tue, 22 Sep 2009) | 10 lines
          
          Merged revisions 1024963 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1024963 | winterz | 2009-09-17 13:33:31 -0400 (Thu, 17 Sep 2009) | 3 lines
            
            use Nuno's pretty new icons for birthdays and anniversaries.
            MERGE: e4,trunk
          ........
        ................
      ................
        r1026926 | winterz | 2009-09-22 22:47:45 +0200 (Tue, 22 Sep 2009) | 5 lines
        
        merge SVN commit 1026924 by winterz:
        
        put the birthday | anniversary icons on items in Agenda view
      ................
        r1026928 | winterz | 2009-09-22 22:53:07 +0200 (Tue, 22 Sep 2009) | 10 lines
        
        Recorded merge of revisions 1026924 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1026924 | winterz | 2009-09-22 16:46:01 -0400 (Tue, 22 Sep 2009) | 3 lines
          
          put the birthday | anniversary icons on items in Agenda view.
          MERGE: trunk
        ........
      ................
        r1026992 | tstaerk | 2009-09-23 08:18:30 +0200 (Wed, 23 Sep 2009) | 1 line
        
        Opening brackets should be on the same column as the respective closing brackets.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/akonadi/; revision=1026997
      9ed78ca7