Home GnuPG

Description

SVN_MERGE

Merged revisions 1058311,1058546,1058554,1058559,1058561,1058564,1058587,1058640,1058857,1058867,1058994,1059035,1059047,1059082,1060040,1060047,1060289,1060297,1060299,1060313,1060704,1060735 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................

r1058311 | tmcguire | 2009-12-04 10:51:39 +0100 (Fri, 04 Dec 2009) | 70 lines

Block cyclic merges + blocks
SVN_SILENT
SVN_MERGE
Blocked revisions 1054305,1054308,1056622,1057946 via svnmerge

................
  r1054305 | tmcguire | 2009-11-25 22:00:34 +0100 (Wed, 25 Nov 2009) | 17 lines

  Block scripty + kimap
  SVN_SILENT
  SVN_MERGE
  Blocked revisions 1051105,1051244 via svnmerge

  ........
    r1051105 | krake | 2009-11-18 22:32:10 +0100 (Wed, 18 Nov 2009) | 4 lines

    Backport of revision 1050785

    Return all the capabilities as upper case, so that we don't have to deal with casing issues in client code.
  ........
    r1051244 | scripty | 2009-11-19 05:16:19 +0100 (Thu, 19 Nov 2009) | 1 line

    SVN_SILENT made messages (.desktop file)
  ........
................
  r1054308 | tmcguire | 2009-11-25 22:04:35 +0100 (Wed, 25 Nov 2009) | 17 lines

  SVN_MERGE
  SVN_SILENT
  Recorded merge of revisions 1048619 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

  ........
    r1048619 | cgiboudeaux | 2009-11-13 17:03:20 +0100 (Fri, 13 Nov 2009) | 9 lines

    Backport r1041334 from trunk to 4.3:

    Public holiday for Luxembourg.

    Thanks to Georges Toth (gtoth at trypill org) for the data.

    (a German translation would be welcome)
  ........
................
  r1056622 | winterz | 2009-11-30 14:23:16 +0100 (Mon, 30 Nov 2009) | 10 lines

  Merged revisions 1056612 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1056612 | winterz | 2009-11-30 07:57:26 -0500 (Mon, 30 Nov 2009) | 3 lines

    crash guard if the mimetype for the invitation attachment is empty.
    MERGE: e4 (already in trunk)
  ........
................
  r1057946 | winterz | 2009-12-03 18:14:14 +0100 (Thu, 03 Dec 2009) | 11 lines

  Merged revisions 1057943 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1057943 | winterz | 2009-12-03 12:07:19 -0500 (Thu, 03 Dec 2009) | 4 lines

    bring sortEvents() up-to-date with the version in trunk; ie. to properly
    support allday events.
    MERGE: e4
  ........
................

................

r1058546 | tokoe | 2009-12-04 17:48:15 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT fix coding style

................

r1058554 | tokoe | 2009-12-04 17:58:12 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT krazy fixes

................

r1058559 | tokoe | 2009-12-04 18:01:20 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT krazy fixes

................

r1058561 | tokoe | 2009-12-04 18:18:21 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT fix krazy issues

................

r1058564 | tokoe | 2009-12-04 18:26:34 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT fix krazy issues

................

r1058587 | tokoe | 2009-12-04 20:01:35 +0100 (Fri, 04 Dec 2009) | 2 lines

SVN_SILENT fix krazy issues

................

r1058640 | tokoe | 2009-12-04 22:02:39 +0100 (Fri, 04 Dec 2009) | 2 lines

fix krazy issue the right way

................

r1058857 | tokoe | 2009-12-05 10:46:03 +0100 (Sat, 05 Dec 2009) | 2 lines

SVN_SILENT fix krazy issues

................

r1058867 | tokoe | 2009-12-05 10:51:06 +0100 (Sat, 05 Dec 2009) | 2 lines

The QString() assignment is correct here, so silent krazy

................

r1058994 | tokoe | 2009-12-05 14:58:16 +0100 (Sat, 05 Dec 2009) | 2 lines

Fix krazy issues the right way

................

r1059035 | tokoe | 2009-12-05 17:05:20 +0100 (Sat, 05 Dec 2009) | 2 lines

Preserve timezone information when editing a contact

................

r1059047 | krake | 2009-12-05 17:52:22 +0100 (Sat, 05 Dec 2009) | 2 lines

Add hint for reimplementors of AgentBase::cleanup()

................

r1059082 | tokoe | 2009-12-05 20:41:23 +0100 (Sat, 05 Dec 2009) | 3 lines

Fetch information about the parent collection as well,
it is needed by the sync algorithm

................

r1060040 | winterz | 2009-12-07 23:54:02 +0100 (Mon, 07 Dec 2009) | 2 lines

also check for NULL usage

................

r1060047 | cgiboudeaux | 2009-12-08 00:16:13 +0100 (Tue, 08 Dec 2009) | 1 line

We now require Boost 1.34.0

................

r1060289 | winterz | 2009-12-08 14:47:50 +0100 (Tue, 08 Dec 2009) | 2 lines

describe the file format

................

r1060297 | annma | 2009-12-08 15:33:26 +0100 (Tue, 08 Dec 2009) | 2 lines

typo

................

r1060299 | annma | 2009-12-08 15:35:27 +0100 (Tue, 08 Dec 2009) | 4 lines

not sure the colors are OK but it improves things in KOrganizer
in Calendar attached to Plasma clock though, everything is labelled as "holiday" which is wrong - needs further investigation
CCBUG=217804

................

r1060313 | nlecureuil | 2009-12-08 15:54:30 +0100 (Tue, 08 Dec 2009) | 1 line

Fix a crash

................

r1060704 | tokoe | 2009-12-09 19:08:17 +0100 (Wed, 09 Dec 2009) | 2 lines

Add apidocs

................

r1060735 | krake | 2009-12-09 20:42:06 +0100 (Wed, 09 Dec 2009) | 12 lines

Sesame2 is no longer the only backend known to work.
In fact Nepomuk changed to Virtuoso as its default so this would needlessly alert users.

Switching the check to explicit blacklisting to avoid that happing in the future.

Assuming exception from string freeze after getting one OK and no complains in > 48 hours.

CCMAIL: kde-i18n-doc@kde.org
CCMAIL: kde-core-devel@kde.org
CCMAIL: kde-pim@kde.org

................

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1061032

Details

Provenance
Volker Krause <vkrause@kde.org>Authored on Dec 10 2009, 3:12 PM
Parents
rGPGMEPPbec438113ebd: SVN_SILENT fix krazy issues
rGPGMEPP36834932d29e: fix crash
Branches
Unknown
Tags
Unknown

Event Timeline

Volker Krause <vkrause@kde.org> committed rGPGMEPPf9cd7e6d32f7: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Dec 10 2009, 3:12 PM