1. 02 Sep, 2009 2 commits
  2. 31 Aug, 2009 4 commits
  3. 27 Aug, 2009 1 commit
  4. 26 Aug, 2009 2 commits
  5. 22 Aug, 2009 1 commit
  6. 17 Aug, 2009 5 commits
  7. 13 Aug, 2009 9 commits
  8. 12 Aug, 2009 2 commits
  9. 11 Aug, 2009 3 commits
    • Volker Krause's avatar
      SVN_MERGE · 2f497569
      Volker Krause authored
      Merged revisions 1009540,1009546,1009619,1009699,1009758,1009794-1009797,1009799,1009821,1009831,1009852-1009853 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1009540 | scripty | 2009-08-10 11:19:47 +0200 (Mon, 10 Aug 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
        r1009546 | mlaurent | 2009-08-10 11:22:51 +0200 (Mon, 10 Aug 2009) | 3 lines
        
        disable "create TODO" when korganizer is not on system
        (for example on distro which splits all kdepim)
      ........
        r1009619 | winterz | 2009-08-10 15:43:16 +0200 (Mon, 10 Aug 2009) | 2 lines
        
        CamelCase header for HtmlExportSettings
      ........
        r1009699 | finex | 2009-08-10 18:38:03 +0200 (Mon, 10 Aug 2009) | 5 lines
        
        Disable title resizing on knotes
        
        CCBUG:175309
      ........
        r1009758 | pokrzywka | 2009-08-10 21:45:10 +0200 (Mon, 10 Aug 2009) | 2 lines
        
        have mercy for the export macros on windows, do NOT include the same files in multiple libs...
        I'm not sure that's the right place to add the lib, but that fixes the build for now
      ........
        r1009794 | otrichet | 2009-08-10 23:07:39 +0200 (Mon, 10 Aug 2009) | 1 line
        
        Show test in KDevelop
      ........
        r1009795 | otrichet | 2009-08-10 23:07:46 +0200 (Mon, 10 Aug 2009) | 7 lines
        
        Krazy fix:
          - Spelling: infos -> information
          - single char QString
          - KUIT + i18n context
          - foreach loop issues
          - exclude false positive (KNCleanUp::showMessage catched for QSystemTrayIcon::showMessage)
          - exclude .rc file which are not kpartgui files from tests
      ........
        r1009796 | otrichet | 2009-08-10 23:07:53 +0200 (Mon, 10 Aug 2009) | 5 lines
        
        List of available charsets encoding:
         - remove invalid charsets (without encoder/decoder) and UTF-16 (bug #168327)
         - display description along charset name in every list of charsets
        
        BUG: 168327
      ........
        r1009797 | otrichet | 2009-08-10 23:07:58 +0200 (Mon, 10 Aug 2009) | 8 lines
        
        Rename "Automatic" to "Default" in the list of charset
        
        Nowadays system are using UTF-8 by default (not legacy encoding like
        ISO-8859-15 or KOI8-R) and using the system-wide charset is just
        misleading users. So we use "Default" not to imply there is some
        automatic detection of a missing charset.
        
        BUG: 187885
      ........
        r1009799 | winterz | 2009-08-10 23:10:21 +0200 (Mon, 10 Aug 2009) | 6 lines
        
        Put back HTMLExportSettings and include it in KOrganizer.
        This is the correct thing to do.
        
        However, for back compatibility provide the old HtmlExportSettings as well.
        CCMAIL: montel@kde.org
      ........
        r1009821 | mkoller | 2009-08-11 00:16:36 +0200 (Tue, 11 Aug 2009) | 2 lines
        
        create correct email headers from a digest mail
      ........
        r1009831 | djarvie | 2009-08-11 01:14:36 +0200 (Tue, 11 Aug 2009) | 2 lines
        
        Improve part-disabled icon
      ........
        r1009852 | pokrzywka | 2009-08-11 02:56:15 +0200 (Tue, 11 Aug 2009) | 1 line
        
        only enable #warning for gcc, as msvc doesn't understand it
      ........
        r1009853 | pokrzywka | 2009-08-11 02:57:12 +0200 (Tue, 11 Aug 2009) | 1 line
        
        fixed the export macro breakage on windows
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/; revision=1009890
      2f497569
    • Romain Pokrzywka's avatar
      fixed the export macro breakage on windows · d67e38ce
      Romain Pokrzywka authored
      svn path=/trunk/KDE/kdepim/kaddressbook/; revision=1009853
      d67e38ce
    • Romain Pokrzywka's avatar
      only enable #warning for gcc, as msvc doesn't understand it · c26afe92
      Romain Pokrzywka authored
      svn path=/trunk/KDE/kdepim/kaddressbook/; revision=1009852
      c26afe92
  10. 10 Aug, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · 6eda6e5d
      Volker Krause authored
      Merged revisions 1008301,1008405,1008420,1008553,1008566,1008804,1008816,1008836-1008839,1008842,1008847,1008851,1008853-1008854,1008885,1008888,1008890,1008900,1008959,1008963,1008978,1008992-1008993,1009016,1009070,1009076,1009234,1009281,1009316,1009328,1009350,1009359,1009385,1009394,1009406 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1008301 | tokoe | 2009-08-07 10:56:24 +0200 (Fri, 07 Aug 2009) | 2 lines
        
        Add a tab for executing SPARQL queries and listing the matching items.
      ........
        r1008405 | tokoe | 2009-08-07 14:57:17 +0200 (Fri, 07 Aug 2009) | 2 lines
        
        Add 'search contacts by name' example
      ........
        r1008420 | cgiboudeaux | 2009-08-07 15:25:00 +0200 (Fri, 07 Aug 2009) | 1 line
        
        Fix include
      ........
        r1008553 | mkoller | 2009-08-07 22:12:40 +0200 (Fri, 07 Aug 2009) | 6 lines
        
        FEATURE: 117477
        
        add a new "loop on goto unread messages" option: LoopInAllMarkedFolders
        which only checks the folders which are marked as "act on unread mail"
        and modify the current LoopInAllFolders to loop really in _all_ folders
      ........
        r1008566 | winterz | 2009-08-07 22:57:54 +0200 (Fri, 07 Aug 2009) | 3 lines
        
        minor coding style issues
        SVN_SILENT:
      ........
        r1008804 | binner | 2009-08-08 14:28:18 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        fix build for snapshot tarballs: akonadi/ is in kdepim-runtime there
      ........
        r1008816 | winterz | 2009-08-08 14:59:37 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        skip libkdepim-copy
      ........
        r1008836 | winterz | 2009-08-08 15:21:47 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        explicit constructors, per Krazy
      ........
        r1008837 | winterz | 2009-08-08 15:22:11 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        explicit constructor
      ........
        r1008838 | winterz | 2009-08-08 15:25:10 +0200 (Sat, 08 Aug 2009) | 3 lines
        
        compiler warning-- 
        initialization order
      ........
        r1008839 | winterz | 2009-08-08 15:28:20 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        foo = QString() -> foo.clear()
      ........
        r1008842 | winterz | 2009-08-08 15:33:06 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        misspellings--
      ........
        r1008847 | winterz | 2009-08-08 15:47:39 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        single char operation fixes, per Krazy
      ........
        r1008851 | winterz | 2009-08-08 15:51:38 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        fix wrong number arguments passed to i18n()
      ........
        r1008853 | winterz | 2009-08-08 15:54:01 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        also skip resources/openchange as this hasn't had any activity for a long time
      ........
        r1008854 | winterz | 2009-08-08 15:56:12 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        pass QLatin1Strings to QString::startsWith(), per Krazy
      ........
        r1008885 | winterz | 2009-08-08 17:20:11 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        const ref iterators, per Krazy
      ........
        r1008888 | winterz | 2009-08-08 17:28:49 +0200 (Sat, 08 Aug 2009) | 3 lines
        
        use the Q_OBJECT macro
        explicit constructor
      ........
        r1008890 | winterz | 2009-08-08 17:31:34 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        explicit ctors
      ........
        r1008900 | winterz | 2009-08-08 18:01:33 +0200 (Sat, 08 Aug 2009) | 3 lines
        
        minor coding style
        SVN_SILENT:
      ........
        r1008959 | djarvie | 2009-08-08 21:18:47 +0200 (Sat, 08 Aug 2009) | 1 line
        
        Make information message intelligible
      ........
        r1008963 | djarvie | 2009-08-08 21:27:36 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        Bug 197496: Fix bad addresses when sending email alarms.
      ........
        r1008978 | cgiboudeaux | 2009-08-08 22:19:48 +0200 (Sat, 08 Aug 2009) | 1 line
        
        Fix includes.
      ........
        r1008992 | winterz | 2009-08-08 23:22:22 +0200 (Sat, 08 Aug 2009) | 5 lines
        
        Move the KOMailClient class into the korganizer_eventviewer library, so it can
        be shared with korgac.
        
        Refactor KOMailClient to be independent of the KOrganizer prefs.
      ........
        r1008993 | winterz | 2009-08-08 23:23:02 +0200 (Sat, 08 Aug 2009) | 2 lines
        
        follow the KOMailClient changes
      ........
        r1009016 | winterz | 2009-08-09 00:41:25 +0200 (Sun, 09 Aug 2009) | 3 lines
        
        CamelCase headers
        Remove unused headers
      ........
        r1009070 | tokoe | 2009-08-09 08:53:40 +0200 (Sun, 09 Aug 2009) | 2 lines
        
        Make it compile for separated built of akonadi
      ........
        r1009076 | mlaurent | 2009-08-09 10:43:13 +0200 (Sun, 09 Aug 2009) | 2 lines
        
        not necessary
      ........
        r1009234 | djarvie | 2009-08-09 14:43:12 +0200 (Sun, 09 Aug 2009) | 2 lines
        
        Install action icons into kalarm directory, not system directory
      ........
        r1009281 | mlaurent | 2009-08-09 17:40:04 +0200 (Sun, 09 Aug 2009) | 2 lines
        
        Fix mem leak
      ........
        r1009316 | jbendig | 2009-08-09 19:37:10 +0200 (Sun, 09 Aug 2009) | 3 lines
        
        Added default aggregation and theme settings for message list to Appearance->Message List in the Configure dialog.
        Renamed "Appearance (Theme)" to "Theme" in View->Message List for clarity.
      ........
        r1009328 | mkoller | 2009-08-09 20:28:49 +0200 (Sun, 09 Aug 2009) | 4 lines
        
        FEATURE: 199342
        
        Add "Mark as Action Item" filter action
      ........
        r1009350 | mkoller | 2009-08-09 21:42:51 +0200 (Sun, 09 Aug 2009) | 4 lines
        
        BUG: 198289
        
        Show hovered URL in reader window status bar.
      ........
        r1009359 | djarvie | 2009-08-09 21:53:56 +0200 (Sun, 09 Aug 2009) | 2 lines
        
        Show system tray indication when individual alarms are disabled.
      ........
        r1009385 | mkoller | 2009-08-09 23:21:09 +0200 (Sun, 09 Aug 2009) | 5 lines
        
        BUG: 178402
        
        Make custom fonts settings work again.
      ........
        r1009394 | tmcguire | 2009-08-09 23:47:42 +0200 (Sun, 09 Aug 2009) | 4 lines
        
        Bring back the ability to drag images from KSnapshot and add them as attachments.
        
        BUG: 202101
      ........
        r1009406 | mkoller | 2009-08-10 00:20:00 +0200 (Mon, 10 Aug 2009) | 4 lines
        
        BUG: 202297
        
        also show the email address (not only the name) in Enterprise style
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/; revision=1009483
      6eda6e5d
  11. 09 Aug, 2009 1 commit
  12. 08 Aug, 2009 2 commits
  13. 07 Aug, 2009 1 commit
    • Volker Krause's avatar
      SVN_MERGE · e783eb8b
      Volker Krause authored
      Merged revisions 1007870,1007874,1008041-1008043,1008051,1008122 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1007870 | mlaurent | 2009-08-06 13:31:17 +0200 (Thu, 06 Aug 2009) | 2 lines
        
        Fix include
      ........
        r1007874 | tokoe | 2009-08-06 13:44:41 +0200 (Thu, 06 Aug 2009) | 2 lines
        
        Pass a correct URL to nepomuk for homepages
      ........
        r1008041 | mkoller | 2009-08-06 20:42:04 +0200 (Thu, 06 Aug 2009) | 5 lines
        
        - avoid crash when POP server returns invalid response after LIST command.
        - make the error message after a problem with the LIST command non-modal by using
          KNotification
          
      ........
        r1008042 | lueck | 2009-08-06 20:45:44 +0200 (Thu, 06 Aug 2009) | 1 line
        
        needs this translation catalog too for group dialogs
      ........
        r1008043 | yurchor | 2009-08-06 20:47:15 +0200 (Thu, 06 Aug 2009) | 1 line
        
        Spelling fixes
      ........
        r1008051 | tokoe | 2009-08-06 21:17:05 +0200 (Thu, 06 Aug 2009) | 2 lines
        
        Remove last references to KContactManager
      ........
        r1008122 | mlaurent | 2009-08-07 00:47:03 +0200 (Fri, 07 Aug 2009) | 2 lines
        
        Fix pedantic
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/; revision=1008224
      e783eb8b
  14. 06 Aug, 2009 5 commits
    • Burkhard Lück's avatar
      needs this translation catalog too for group dialogs · c8230027
      Burkhard Lück authored
      svn path=/trunk/KDE/kdepim/kaddressbook/; revision=1008042
      c8230027
    • Volker Krause's avatar
      SVN_MERGE · a2b04db7
      Volker Krause authored
      Merged revisions 1007749,1007815,1007821,1007832 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ........
        r1007749 | lueck | 2009-08-06 10:51:39 +0200 (Thu, 06 Aug 2009) | 1 line
        
        needs this translation catalog too
      ........
        r1007815 | cgiboudeaux | 2009-08-06 11:42:11 +0200 (Thu, 06 Aug 2009) | 1 line
        
        Fix a linker error.
      ........
        r1007821 | tokoe | 2009-08-06 11:45:53 +0200 (Thu, 06 Aug 2009) | 2 lines
        
        Remove egroupware xmlrpc specific libraries
      ........
        r1007832 | scripty | 2009-08-06 11:59:34 +0200 (Thu, 06 Aug 2009) | 1 line
        
        SVN_SILENT made messages (.desktop file)
      ........
      
      svn path=/branches/work/akonadi-ports/kdepim/; revision=1007860
      a2b04db7
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) · d1d58fe1
      Script Kiddy authored
      svn path=/trunk/KDE/kdepim/kaddressbook/; revision=1007832
      d1d58fe1
    • Volker Krause's avatar
      SVN_MERGE · f7a76248
      Volker Krause authored
      Merged revisions 1006443,1006446,1006451,1006459,1006761,1006789,1006866,1006895,1006897-1006899,1006916,1006953,1007014,1007039,1007045,1007175,1007211,1007286,1007291-1007292,1007307,1007309,1007352,1007358-1007360,1007365,1007367-1007368,1007394,1007398,1007403-1007406,1007413,1007417-1007418,1007421-1007423,1007448,1007511,1007520,1007527,1007580,1007709-1007710 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
      
      ................
        r1006443 | mkoller | 2009-08-03 21:06:10 +0200 (Mon, 03 Aug 2009) | 6 lines
        
        BUG: 169092
        
        After the external editor closed, reopen the temporary file to ensure
        that a possible new file the editor recreated will be read.
        Based on a patch by  Brian Overstreet
      ................
        r1006446 | mkoller | 2009-08-03 21:09:33 +0200 (Mon, 03 Aug 2009) | 5 lines
        
        FEATURE: 48842
        
        Allow to pass the current line number from the internal editor to
        the external editor by using %l
      ................
        r1006451 | mkoller | 2009-08-03 21:17:23 +0200 (Mon, 03 Aug 2009) | 4 lines
        
        make sure the mail edited in the external editor is known to be modified,
        otherwise closing the composer window (e.g. during editing of a draft mail)
        would simply discard the mail without asking.
      ................
        r1006459 | mkoller | 2009-08-03 21:38:57 +0200 (Mon, 03 Aug 2009) | 4 lines
        
        BUG: 172362
        
        Do not launch the external editor on modifier keypress alone
      ................
        r1006761 | mkoller | 2009-08-04 12:38:18 +0200 (Tue, 04 Aug 2009) | 2 lines
        
        avoid URL encoding given external editor argument %f
      ................
        r1006789 | mkoller | 2009-08-04 14:22:08 +0200 (Tue, 04 Aug 2009) | 4 lines
        
        BUG: 136407
        
        make sure to find the real mail address part when adding the defaultdomain
      ................
        r1006866 | tmcguire | 2009-08-04 18:17:10 +0200 (Tue, 04 Aug 2009) | 5 lines
        
        Upps, don't include attachments when replying. Makes me wonder why this works in the other branches.
        
        BUG: 202186
        MERGE: 4.3, e35, e4 (for saftey's sake)
      ................
        r1006895 | tokoe | 2009-08-04 19:21:57 +0200 (Tue, 04 Aug 2009) | 2 lines
        
        Show columns according to the headers settings
      ................
        r1006897 | tokoe | 2009-08-04 19:27:13 +0200 (Tue, 04 Aug 2009) | 4 lines
        
        Extend the ContactGroupEditor by a new ContactGroupLineEdit that
        allows autocompletion of contacts and therefor references to existing
        contacts.
      ................
        r1006898 | tokoe | 2009-08-04 19:28:48 +0200 (Tue, 04 Aug 2009) | 2 lines
        
        Create a completion model and pass it to the contact group editor
      ................
        r1006899 | tokoe | 2009-08-04 19:29:09 +0200 (Tue, 04 Aug 2009) | 2 lines
        
        deprecated--
      ................
        r1006916 | tokoe | 2009-08-04 19:48:17 +0200 (Tue, 04 Aug 2009) | 2 lines
        
        Store and reload the settings of the columns to show in the contact view
      ................
        r1006953 | mkoller | 2009-08-04 21:30:25 +0200 (Tue, 04 Aug 2009) | 4 lines
        
        BUG: 139551
        
        also create the index.ids file to be only read/writable by the owner
      ................
        r1007014 | winterz | 2009-08-04 23:54:33 +0200 (Tue, 04 Aug 2009) | 5 lines
        
        use the new view-calendar icon instead of view-pim-calendar.
        this is because view-pim-calendar contains a '14' which can
        lead to confusion especially when the icon is used in list.
      ................
        r1007039 | djarvie | 2009-08-05 01:57:06 +0200 (Wed, 05 Aug 2009) | 1 line
        
        Update
      ................
        r1007045 | mkoller | 2009-08-05 03:08:09 +0200 (Wed, 05 Aug 2009) | 4 lines
        
        BUG: 138725
        
        decode mailto: URL when dropping
      ................
        r1007175 | tokoe | 2009-08-05 11:26:38 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Good bye KAddressBook, we'll miss you!
      ................
        r1007211 | tokoe | 2009-08-05 12:01:32 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Oops, shouldn't be excluded
      ................
        r1007286 | tokoe | 2009-08-05 14:53:51 +0200 (Wed, 05 Aug 2009) | 4 lines
        
        Remove the XMLRPC based egroupware resource, according to
        the eGroupware developers the groupdav based resource should
        be used instead.
      ................
        r1007291 | tokoe | 2009-08-05 15:05:36 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Renamed KContactManager to KAddressBook
      ................
        r1007292 | tokoe | 2009-08-05 15:06:29 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Add missing file
      ................
        r1007307 | tokoe | 2009-08-05 15:41:57 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Remove dbus interface dependency
      ................
        r1007309 | tokoe | 2009-08-05 15:48:03 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Removed unused(?) dbus interface dependency
      ................
        r1007352 | tokoe | 2009-08-05 17:35:53 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Fix icon names
      ................
        r1007358 | tokoe | 2009-08-05 17:53:21 +0200 (Wed, 05 Aug 2009) | 1 line
      ................
        r1007359 | lueck | 2009-08-05 17:53:34 +0200 (Wed, 05 Aug 2009) | 1 line
        
        fix broken i18n call
      ................
        r1007360 | tokoe | 2009-08-05 17:53:54 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Renamed the kcontactmanager plugin to kaddressbook plugin
      ................
        r1007365 | jtamate | 2009-08-05 18:26:44 +0200 (Wed, 05 Aug 2009) | 3 lines
        
        The removed line said: for KDE_signal, remove in KDEPIM 4.2
        It will be removed for KDEPIM 4.4 instead.
        Also remove the handle for SIGKILL, that is impossible to handle.
      ................
        r1007367 | tokoe | 2009-08-05 18:41:11 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        Remove deprecated dbus interface dependency
      ................
        r1007368 | mkoller | 2009-08-05 18:52:18 +0200 (Wed, 05 Aug 2009) | 4 lines
        
        On the first run of kmail make sure that the "Local Folders" tree node is
        shown expanded, which makes a much better first impression than the
        two not-expanded folders "Local Folders" and "Search"
      ................
        r1007394 | tmcguire | 2009-08-05 19:51:08 +0200 (Wed, 05 Aug 2009) | 10 lines
        
        SVN_MERGE
        Merged revisions 1004155 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1004155 | mutz | 2009-07-29 14:57:16 +0200 (Wed, 29 Jul 2009) | 1 line
          
          GnuPGProcessCommand: add postSuccessHook()
        ........
      ................
        r1007398 | tmcguire | 2009-08-05 19:58:53 +0200 (Wed, 05 Aug 2009) | 20 lines
        
        SVN_MERGE
        Merged revisions 1004779 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1004779 | winterz | 2009-07-30 22:45:16 +0200 (Thu, 30 Jul 2009) | 12 lines
          
          Merged revisions 1004766 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1004766 | winterz | 2009-07-30 16:21:19 -0400 (Thu, 30 Jul 2009) | 5 lines
            
            If the user deletes an event invitation, they can now optionally not notify
            the organizer about it. Thereby silently removing themselves from the attendee list.
            
            kolab/issue3781
          ........
        ................
      ................
        r1007403 | tmcguire | 2009-08-05 20:07:18 +0200 (Wed, 05 Aug 2009) | 538 lines
        
        Block cyclic merges, blocks, release stuff etc
        SVN_SILENT
        Blocked revisions 1004784,1004993,1004998,1005004,1005012,1005019,1005024,1005029,1005043,1005047,1005054,1005060,1005063,1005073,1005172,1005178,1006385,1006411,1006809,1006876 via svnmerge
        
        ................
          r1004784 | winterz | 2009-07-30 23:03:32 +0200 (Thu, 30 Jul 2009) | 14 lines
          
          Merged revisions 1004776 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1004776 | winterz | 2009-07-30 16:40:43 -0400 (Thu, 30 Jul 2009) | 8 lines
            
            merge SVN commit 1004765 by tmcguire from trunk to e35:
            
            Make it work properly, before it quoted the wrong message.
            
            Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
            the template there.
          ........
        ................
          r1004993 | tmcguire | 2009-07-31 11:27:42 +0200 (Fri, 31 Jul 2009) | 170 lines
          
          Block scripty, akonadi, kpilot, kalarm, cyclic merges, ...
          SVN_SILENT
          --
          Blocked revisions 1000881,1001161,1001163,1001166,1001404,1001491-1001492,1001598,1001664,1002047,1002674,1002687,1002821,1003257,1003296,1003352,1003999,1004250,1004268,1004271-1004272,1004449 via svnmerge
          
          ................
            r1000881 | scripty | 2009-07-22 11:15:19 +0200 (Wed, 22 Jul 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1001161 | tmcguire | 2009-07-22 18:30:18 +0200 (Wed, 22 Jul 2009) | 16 lines
            
            Backport r1000891 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 998459 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ........
              r998459 | winterz | 2009-07-17 19:38:03 +0200 (Fri, 17 Jul 2009) | 5 lines
              
              use @info:status instead of @info:tooltip for the systray tooltip.
              else, we get richtext for the systray tooltip which doesn't work well in Windows.
              
              MERGE: trunk,4.3
            ........
          ................
            r1001163 | tmcguire | 2009-07-22 18:31:39 +0200 (Wed, 22 Jul 2009) | 24 lines
            
            Backport r1000895 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 999842 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r999842 | winterz | 2009-07-20 16:08:49 +0200 (Mon, 20 Jul 2009) | 13 lines
              
              Merged revisions 999834 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r999834 | winterz | 2009-07-20 10:06:02 -0400 (Mon, 20 Jul 2009) | 6 lines
                
                support status "needs-action", even though this is not according to spec.
                apparently Kolab 2.2.0 sets it anyway.  so let's be nice about it.
                
                should fix kolab/issue3766
                MERGE: e4,trunk,4.3
              ........
            ................
          ................
            r1001166 | tmcguire | 2009-07-22 18:32:56 +0200 (Wed, 22 Jul 2009) | 24 lines
            
            Backport r1000898 by tmcguire from trunk to the 4.3 branch:
            
            SVN_MERGE
            Merged revisions 1000512 via svnmerge from 
            svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
            
            ................
              r1000512 | winterz | 2009-07-21 15:39:07 +0200 (Tue, 21 Jul 2009) | 13 lines
              
              Merged revisions 1000510 via svnmerge from 
              https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
              
              ........
                r1000510 | winterz | 2009-07-21 09:30:54 -0400 (Tue, 21 Jul 2009) | 6 lines
                
                add status "needs-action" to a blacklist of unknown statuses, thereby reverting
                my former idea that we should all it.
                
                kolab/issue3766
                MERGE: e4,trunk,4.3
              ........
            ................
          ................
            r1001404 | djarvie | 2009-07-23 09:35:34 +0200 (Thu, 23 Jul 2009) | 9 lines
            
            Use new setting after "prompt for calendar to store in" selection changes.
            sssssssssssssssssssssssssssssssssssssssssssssss
            
            M    alarmcalendar.h
            M    alarmcalendar.cpp
            M    kalarmconfig.kcfg
            M    Changelog
            M    kalarm.h
          ................
            r1001491 | winterz | 2009-07-23 14:51:19 +0200 (Thu, 23 Jul 2009) | 8 lines
            
            Backport r997969 by bbroeksema from trunk to the 4.3 branch:
            
            Enable the backup/restore actions again. These are still working fine, so no
            reason to keep them disabled.
            
            MERGE: 4.3
          ................
            r1001492 | winterz | 2009-07-23 14:51:57 +0200 (Thu, 23 Jul 2009) | 10 lines
            
            Backport r999883 by bbroeksema from trunk to the 4.3 branch:
            
            Replace the combobox widget with a treeview in the settings pages of akonadi
            based conduits.
            
            Thanks Robert Marmorstein for providing this patch!
            
            CCBUG: 181558
          ................
            r1001598 | djarvie | 2009-07-23 20:30:19 +0200 (Thu, 23 Jul 2009) | 2 lines
            
            Bug 198072: sort alarm list after an alarm triggers
          ................
            r1001664 | djarvie | 2009-07-23 23:52:17 +0200 (Thu, 23 Jul 2009) | 2 lines
            
            Display translated time zone names in time zone selection combo box.
          ................
            r1002047 | djarvie | 2009-07-24 22:33:56 +0200 (Fri, 24 Jul 2009) | 1 line
            
            Fix error warning colour
          ................
            r1002674 | djarvie | 2009-07-26 21:17:43 +0200 (Sun, 26 Jul 2009) | 2 lines
            
            Make the Defaults button in configuration dialogue set the correct default values.
          ................
            r1002687 | djarvie | 2009-07-26 21:48:29 +0200 (Sun, 26 Jul 2009) | 2 lines
            
            Fix read-only mode for sound configuration dialogue
          ................
            r1002821 | scripty | 2009-07-27 05:15:34 +0200 (Mon, 27 Jul 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1003257 | djarvie | 2009-07-28 00:24:06 +0200 (Tue, 28 Jul 2009) | 2 lines
            
            Bug 193209: possible fix for the dialog showing all grey, by repainting the dialog after its first resize.
          ................
            r1003296 | winterz | 2009-07-28 01:50:56 +0200 (Tue, 28 Jul 2009) | 2 lines
            
            update version string for 4.3.0 final.
          ................
            r1003352 | scripty | 2009-07-28 05:23:02 +0200 (Tue, 28 Jul 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1003999 | scripty | 2009-07-29 05:36:24 +0200 (Wed, 29 Jul 2009) | 1 line
            
            SVN_SILENT made messages (.desktop file)
          ................
            r1004250 | amantia | 2009-07-29 20:01:31 +0200 (Wed, 29 Jul 2009) | 2 lines
            
            Backport r1004248: use the right mimetype
          ................
            r1004268 | djarvie | 2009-07-29 20:31:07 +0200 (Wed, 29 Jul 2009) | 3 lines
            
            Command line options: validate better, and remove unnecessary restrictions.
            Backport of commit 991759.
          ................
            r1004271 | djarvie | 2009-07-29 20:39:24 +0200 (Wed, 29 Jul 2009) | 2 lines
            
            Make shift-delete delete without confirmation prompt
          ................
            r1004272 | djarvie | 2009-07-29 20:45:14 +0200 (Wed, 29 Jul 2009) | 2 lines
            
            "Font & Color" -> "Font && Color" to fix ampersand not being displayed
          ................
            r1004449 | osterfeld | 2009-07-30 10:08:03 +0200 (Thu, 30 Jul 2009) | 1 line
            
            link
          ................
        ................
          r1004998 | tmcguire | 2009-07-31 11:30:30 +0200 (Fri, 31 Jul 2009) | 15 lines
          
          Another akonadi block
          SVN_SILENT
          --
          Blocked revisions 1001211 via svnmerge
          
          ........
            r1001211 | winterz | 2009-07-22 19:21:32 +0200 (Wed, 22 Jul 2009) | 7 lines
            
            Backport r1000542 by cgiboudeaux from trunk to the 4.3 branch:
            
            Don't return the korganizer version but the akonadi one.
            
            BACKPORT: 4.3 (this string is not translated)
          ........
        ................
          r1005004 | tmcguire | 2009-07-31 11:33:40 +0200 (Fri, 31 Jul 2009) | 14 lines
          
          Merged revisions 1001212 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1001212 | winterz | 2009-07-22 19:22:03 +0200 (Wed, 22 Jul 2009) | 8 lines
            
            Backport r1000744 by cgiboudeaux from trunk to the 4.3 branch:
            
            Don't set an icon for the bookmark menu or the text will be replaced with any theme != oxygen
            
            CCBUG: 196279
            MERGE:4.3
          ........
        ................
          r1005012 | tmcguire | 2009-07-31 11:37:02 +0200 (Fri, 31 Jul 2009) | 19 lines
          
          New message list, block it
          SVN_SILENT
          --
          Blocked revisions 1001214 via svnmerge
          
          ........
            r1001214 | winterz | 2009-07-22 19:25:46 +0200 (Wed, 22 Jul 2009) | 11 lines
            
            Backport r995025 by tmcguire from trunk to the 4.3 branch:
            
            Don't initally put the focus on the quick search field, but on the view, so that shortcuts like
            + and j work when starting.
            
            This is a workaround, for some reason the setFocus() call in widgetbase.cpp didn't work, the focus_child
            of the mainwindow was reset to 0 for some unknown reason afterwards.
            
            CCBUG: 179992
          ........
        ................
          r1005019 | tmcguire | 2009-07-31 11:39:07 +0200 (Fri, 31 Jul 2009) | 12 lines
          
          Merged revisions 1001215 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1001215 | winterz | 2009-07-22 19:26:36 +0200 (Wed, 22 Jul 2009) | 5 lines
            
            Backport r996061 by bbigras from trunk to the 4.3 branch:
            
            workaround : without showProgressInfo=false, the kiojob remain open forever with https link
            CCBUG: 198671
          ........
        ................
          r1005024 | tmcguire | 2009-07-31 11:41:39 +0200 (Fri, 31 Jul 2009) | 29 lines
          
          Merged revisions 1001216,1001284,1001499 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1001216 | winterz | 2009-07-22 19:27:21 +0200 (Wed, 22 Jul 2009) | 6 lines
            
            Backport r1001203 by jtamate from trunk to the 4.3 branch:
            
            CCBUG: 78712
            
            Do not append a newline if the content-disposition mode already contains a newline.
          ........
            r1001284 | winterz | 2009-07-22 22:20:42 +0200 (Wed, 22 Jul 2009) | 5 lines
            
            backport SVN commit 1001263 by mlaurent:
            
            Make it compile
          ........
            r1001499 | winterz | 2009-07-23 15:29:30 +0200 (Thu, 23 Jul 2009) | 9 lines
            
            Backport r1001498 by winterz from trunk to the 4.3 branch:
            
            fix the fix of the fix for 
            Do not append a newline if the content-disposition mode already contains a newline.
            
            CCBUG: 78712
            CCMAIL: jtamate@gmail.com
          ........
        ................
          r1005029 | tmcguire | 2009-07-31 11:42:46 +0200 (Fri, 31 Jul 2009) | 17 lines
          
          Merged revisions 1001947 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1001947 | winterz | 2009-07-24 17:26:52 +0200 (Fri, 24 Jul 2009) | 11 lines
            
            Backport r1001946 by winterz from trunk to the 4.3 branch:
            
            Make the Kontact summary view uses view text color instead of window text color.
            Thanks for the patch Peter.
            
            also be nicer to the rightToLeft folks with the stylesheet.
            
            CCBUG: 201218
            MERGE: 4.3,e4
          ........
        ................
          r1005043 | tmcguire | 2009-07-31 11:48:48 +0200 (Fri, 31 Jul 2009) | 11 lines
          
          There is no mType variable here, so block it.
          SVN_SILENT
          --
          Blocked revisions 1001956 via svnmerge
          
          ........
            r1001956 | lueck | 2009-07-24 17:49:53 +0200 (Fri, 24 Jul 2009) | 1 line
            
            fix i18n bug: use translated name in the template dialog
          ........
        ................
          r1005047 | tmcguire | 2009-07-31 11:50:10 +0200 (Fri, 31 Jul 2009) | 12 lines
          
          Merged revisions 1002060 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1002060 | winterz | 2009-07-24 22:54:21 +0200 (Fri, 24 Jul 2009) | 6 lines
            
            Backport r1002059 by winterz from trunk to the 4.3 branch:
            
            sorry danimo, but I like the big, fat, header titles with the window color background.
            MERGE: e4,4.3
          ........
        ................
          r1005054 | tmcguire | 2009-07-31 11:54:35 +0200 (Fri, 31 Jul 2009) | 14 lines
          
          The commit message below is wrong, this is about enabling search by status again, r1002525 by jarmond in trunk.
          --
          Merged revisions 1002566 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1002566 | winterz | 2009-07-26 14:26:51 +0200 (Sun, 26 Jul 2009) | 6 lines
            
            Backport r1002059 by winterz from trunk to the 4.3 branch:
            
            sorry danimo, but I like the big, fat, header titles with the window color background.
            MERGE: e4,4.3
          ........
        ................
          r1005060 | tmcguire | 2009-07-31 11:57:30 +0200 (Fri, 31 Jul 2009) | 19 lines
          
          These were already merged manually.
          --
          Recorded merge of revisions 1002960,1002963 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1002960 | winterz | 2009-07-27 14:18:22 +0200 (Mon, 27 Jul 2009) | 5 lines
            
            Backport r1002617 by pokrzywka from trunk to the 4.3 branch:
            
            KMail/win32 crash on too many open files - fix part 1: fix a memory access violation caused by the stale rdict pointer in the storage.
          ........
            r1002963 | winterz | 2009-07-27 14:24:45 +0200 (Mon, 27 Jul 2009) | 4 lines
            
            Backport r1002959 by pokrzywka from trunk to the 4.3 branch:
            
            fix, take 2 : setRDict() already deleted the rdict so avoid the double deletion
          ........
        ................
          r1005063 | tmcguire | 2009-07-31 11:58:45 +0200 (Fri, 31 Jul 2009) | 11 lines
          
          Merged revisions 1003069 via svnmerge from 
          svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
          
          ........
            r1003069 | winterz | 2009-07-27 17:50:17 +0200 (Mon, 27 Jul 2009) | 4 lines
            
            backport SVN commit 1002846 by smartins:
            
            The start and end KDateTimes that are passed to Recurrence::timesInInterval(...) must have a time, so comparing with < and > work as we want
          ........
        ................
          r1005073 | tmcguire | 2009-07-31 12:03:49 +0200 (Fri, 31 Jul 2009) | 46 lines
          
          Block Akregator commits.
          CCMAIL: frank.osterfeld@kdemail.net
          SVN_SILENT
          --
          Blocked revisions 1001224,1001242,1001482,1002704,1002727,1002746 via svnmerge
          
          ........
            r1001224 | osterfeld | 2009-07-22 19:48:44 +0200 (Wed, 22 Jul 2009) | 9 lines
            
            backport
            
            r990009 | otrichet | 2009-07-01 14:26:14 +0200 (Wed, 01 Jul 2009) | 3 lines
            
            Ensure that at least one column is always visible
            
            CCBUG: 184960
          ........
            r1001242 | osterfeld | 2009-07-22 20:23:52 +0200 (Wed, 22 Jul 2009) | 6 lines
            
            Map from visual to logical index, otherwise it's always the date column that is resized (which is the last (visible) column in the model), even if the user changed the visual column order. In that case, the date column got hidden (resized to 1 although not the last visual column).
            
            bad news: this resize hack is still needed as workaround, with current 4.5
             
            CCMAIL:jjm@keelhaul.me.uk
          ........
            r1001482 | osterfeld | 2009-07-23 14:14:18 +0200 (Thu, 23 Jul 2009) | 3 lines
            
            use QPalette::Text, not QPalette::WindowText for read items in the list view
            BUG:201219
          ........
            r1002704 | osterfeld | 2009-07-26 22:16:37 +0200 (Sun, 26 Jul 2009) | 2 lines
            
            be more defensive when it comes to null articles
            BUG:201291
          ........
            r1002727 | osterfeld | 2009-07-26 22:59:19 +0200 (Sun, 26 Jul 2009) | 2 lines
            
            Don't rely on solid telling us about the online state. Apparently Solid reports Disconnected state although the user is connected for some people, thus interval fetching did not work for them at all
            BUG:189394
          ........
            r1002746 | osterfeld | 2009-07-26 23:43:13 +0200 (Sun, 26 Jul 2009) | 2 lines
            
            fix signal name typo
            Taken from a patch by Alexander Elbs
          ........
        ................
          r1005172 | tmcguire | 2009-07-31 15:38:08 +0200 (Fri, 31 Jul 2009) | 1 line
          
          Update NewsLog.txt
        ................
          r1005178 | tmcguire | 2009-07-31 15:40:54 +0200 (Fri, 31 Jul 2009) | 1 line
          
          SVN_SILENT Update version numbers for today's release.
        ................
          r1006385 | winterz | 2009-08-03 18:29:14 +0200 (Mon, 03 Aug 2009) | 12 lines
          
          Blocked revisions 1005151,1005177 via svnmerge
          
          ........
            r1005151 | tmcguire | 2009-07-31 08:54:15 -0400 (Fri, 31 Jul 2009) | 1 line
            
            Update NewsLog.txt
          ........
            r1005177 | tmcguire | 2009-07-31 09:40:46 -0400 (Fri, 31 Jul 2009) | 1 line
            
            SVN_SILENT Update version numbers for today's release.
          ........
        ................
          r1006411 | winterz | 2009-08-03 19:55:41 +0200 (Mon, 03 Aug 2009) | 47 lines
          
          Recorded merge of revisions 1001802,1003678,1004159,1004175,1004190,1004591,1004601 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1001802 | tmcguire | 2009-07-24 05:57:44 -0400 (Fri, 24 Jul 2009) | 2 lines
            
            Refer to the correct button in the dialog.
          ........
            r1003678 | winterz | 2009-07-28 11:56:08 -0400 (Tue, 28 Jul 2009) | 3 lines
            
            don't remove linebreaks from the comments in invitations.
            kolab/issue3719
          ........
            r1004159 | winterz | 2009-07-29 09:11:27 -0400 (Wed, 29 Jul 2009) | 6 lines
            
            Allow an attendee to decline an new invitation without getting the error
            message that the event couldn't be found in their calendar.
            kolab/issue3780
            
            MERGE: e4,trunk,4.3.1
          ........
            r1004175 | winterz | 2009-07-29 10:09:30 -0400 (Wed, 29 Jul 2009) | 3 lines
            
            handle rsvp notices better.
            MERGE: e4,trunk,4.3.1
          ........
            r1004190 | winterz | 2009-07-29 10:31:58 -0400 (Wed, 29 Jul 2009) | 3 lines
            
            more beautification of the rsvp
            MERGE: e4,trunk,4.3.1
          ........
            r1004591 | winterz | 2009-07-30 11:00:41 -0400 (Thu, 30 Jul 2009) | 6 lines
            
            a better fix for kolab/issue3780 that deals with events to delete that cannot
            be found in the user's calendar.
            
            MERGE: e4,trunk,4.3.1
          ........
            r1004601 | winterz | 2009-07-30 11:22:57 -0400 (Thu, 30 Jul 2009) | 6 lines
            
            possible fix for kolab/issue3724 and kolab/issue3780, whereby multiple
            persons having write access to a folder can confuse things for other
            users accessing that folder.
            
            MERGE: e4,trunk,4.3.1
          ........
        ................
          r1006809 | winterz | 2009-08-04 16:06:58 +0200 (Tue, 04 Aug 2009) | 12 lines
          
          Recorded merge of revisions 1006335 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006335 | winterz | 2009-08-03 10:06:46 -0400 (Mon, 03 Aug 2009) | 5 lines
            
            Revert parts of SVN commit 1004175 which caused regressions in invitation handling.
            Should fix critical kolab issues 3685 and 3789
            
            MERGE: e4,trunk,4.3.1
          ........
        ................
          r1006876 | winterz | 2009-08-04 18:31:35 +0200 (Tue, 04 Aug 2009) | 14 lines
          
          Recorded merge of revisions 1006862 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006862 | winterz | 2009-08-04 12:14:49 -0400 (Tue, 04 Aug 2009) | 8 lines
            
            Provide a spinbox for setting the reminder time value, and a separate combobox
            for setting the reminder time units.
            
            This is the beginning of implement kolab/issue3788
            
            MERGE: e4 (already in trunk and 4.3)
          ........
        ................
      ................
        r1007404 | mkoller | 2009-08-05 20:08:05 +0200 (Wed, 05 Aug 2009) | 4 lines
        
        BUG: 117924
        
        On error notifications, show also the account name for the error
      ................
        r1007405 | tmcguire | 2009-08-05 20:08:58 +0200 (Wed, 05 Aug 2009) | 18 lines
        
        SVN_MERGE
        Merged revisions 1004805 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1004805 | winterz | 2009-07-31 00:52:09 +0200 (Fri, 31 Jul 2009) | 10 lines
          
          Merged revisions 1004804 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1004804 | winterz | 2009-07-30 18:48:53 -0400 (Thu, 30 Jul 2009) | 3 lines
            
            make sure to reset the doNotNotify flag when deleting
            part of the fix for kolab/issue3781
          ........
        ................
      ................
        r1007406 | tmcguire | 2009-08-05 20:10:45 +0200 (Wed, 05 Aug 2009) | 21 lines
        
        SVN_MERGE
        Merged revisions 1006371 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1006371 | winterz | 2009-08-03 18:17:49 +0200 (Mon, 03 Aug 2009) | 13 lines
          
          Merged revisions 1006369 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006369 | winterz | 2009-08-03 12:09:55 -0400 (Mon, 03 Aug 2009) | 6 lines
            
            when DND email messages as attachments, try to use the mail subject as the
            attachment name.
            kolab/issue3772
            
            MERGE: e4,trunk
          ........
        ................
      ................
        r1007413 | mkoller | 2009-08-05 20:28:18 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        fix small optical glitch with margin inside tab
      ................
        r1007417 | tmcguire | 2009-08-05 20:32:10 +0200 (Wed, 05 Aug 2009) | 28 lines
        
        Can't hurt to double-check this, I got some conflicts here (mostly coding-style though)
        SVN_MERGE
        Merged revisions 1006568 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ................
          r1006568 | winterz | 2009-08-04 00:32:19 +0200 (Tue, 04 Aug 2009) | 19 lines
          
          Merged revisions 1006551 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006551 | winterz | 2009-08-03 18:16:19 -0400 (Mon, 03 Aug 2009) | 12 lines
            
            Optional Participants and Non-Participants are CC'd on the message and not
            put on the To: recipients line.
            
            If there are no Required Participants (therefore the To: would be empty)
            then we send To: the organizer; else some MUAs do strange things.
            Even KMail will put up a warning about having an empty To: list.
            
            Also, form nice addresses including the common name.
            
            fixes kolab/issue3234
            MERGE: e4,trunk
          ........
        ................
      ................
        r1007418 | tmcguire | 2009-08-05 20:34:11 +0200 (Wed, 05 Aug 2009) | 19 lines
        
        Block this empty commit.
        SVN_SILENT
        Blocked revisions 1006812 via svnmerge
        
        ................
          r1006812 | winterz | 2009-08-04 16:17:42 +0200 (Tue, 04 Aug 2009) | 11 lines
          
          Merged revisions 1006810 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006810 | winterz | 2009-08-04 10:12:07 -0400 (Tue, 04 Aug 2009) | 4 lines
            
            Always allow the invitation to be removed from the user's calendar.
            Fixes critical kolab/issue3779
            MERGE: e4,trunk,4.3.1
          ........
        ................
      ................
        r1007421 | tmcguire | 2009-08-05 20:44:13 +0200 (Wed, 05 Aug 2009) | 15 lines
        
        SVN_MERGE
        Merged revisions 1006874 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
        
        ........
          r1006874 | winterz | 2009-08-04 18:30:17 +0200 (Tue, 04 Aug 2009) | 7 lines
          
          port SVN commit 1006862 by winterz:
          
          Provide a spinbox for setting the reminder time value, and a separate combobox
          for setting the reminder time units.
          
          This is the beginning of implement kolab/issue3788
        ........
      ................
        r1007422 | tmcguire | 2009-08-05 20:45:40 +0200 (Wed, 05 Aug 2009) | 19 lines
        
        Block another cyclic merge.
        SVN_SILENT
        Blocked revisions 1006911 via svnmerge
        
        ................
          r1006911 | winterz | 2009-08-04 19:42:19 +0200 (Tue, 04 Aug 2009) | 11 lines
          
          Merged revisions 1006884 via svnmerge from 
          https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
          
          ........
            r1006884 | winterz | 2009-08-04 12:57:34 -0400 (Tue, 04 Aug 2009) | 4 lines
            
            merge SVN commit 1006866 by tmcguire from trunk to e35:
            
            Upps, don't include attachments when replying. Makes me wonder why this works in the other branches.
          ........
        ................
      ................
        r1007423 | mkoller | 2009-08-05 20:46:54 +0200 (Wed, 05 Aug 2009) | 2 lines
        
        fix margin
      ................
        r1007448 | lueck | 2009-08-05 21:22:20 +0200 (Wed, 05 Aug 2009) | 1 line
        
        port from 4.3 r1007439 to make the Serverside Subscription dialog translated
      ................
        r1007511 | lueck | 2009-08-05 23:12:24 +0200 (Wed, 05 Aug 2009) | 1 line
        
        insert these catalogs to the new kaddressbook to make it more translated
      ................
        r1007520 | mkoller | 2009-08-05 23:26:02 +0200 (Wed, 05 Aug 2009) | 5 lines
        
        BUG: 201374
        
        always add an "open with" button, even if we know the application which can
        open the attachment
      ................
        r1007527 | bbigras | 2009-08-05 23:35:17 +0200 (Wed, 05 Aug 2009) | 3 lines
        
        Show only default addresses in 'Select recipient' dialog. Based on a
        commit from Christian Schaarschmidt on the 3.5.5+ branch.
        BUG: 131796
      ................
        r1007580 | djarvie | 2009-08-06 02:58:57 +0200 (Thu, 06 Aug 2009) | 3 lines
        
        Move KAlarm event and calendar classes to a separate shared library,
        so that the future KAlarm Akonadi resource can access them.
      ................
        r1007709 | bbroeksema | 2009-08-06 09:24:04 +0200 (Thu, 06 Aug 2009) | 9 lines
        
        Makes sure that the hash of a file gets saved after a write in a config file.
        This makes it possible to check if the file has changed between two cold starts
        of a resource.
        
        If the hash has changed, synchronize is called but first clearCache() as we
        have to assume that the information that might be/is cached is invalid by now.
        
        REVIEW: 965
      ................
        r1007710 | bbroeksema | 2009-08-06 09:25:14 +0200 (Thu, 06 Aug 2009) | 3 lines
        
        Notify the user that when the hash was changed, not purged deleted messages will
        show up again.
      ................
      
      svn path=/branches/work/akonadi-ports/kdepim/; revision=1007800
      f7a76248
    • Burkhard Lück's avatar
      needs this translation catalog too · 06c60397
      Burkhard Lück authored
      svn path=/trunk/KDE/kdepim/kaddressbook/; revision=1007749
      06c60397
  15. 05 Aug, 2009 1 commit