Home GnuPG

SVN_MERGE
e1714c1fad55Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1025150,1025189,1025221,1025233,1025281,1025292,1025306,1025319,1025336,1025339,1025341,1025370,1025374-1025376,1025386,1025395-1025396,1025599,1025735,1025754,1025773,1025953,1025989,1025995,1026047,1026062,1026180,1026234,1026236,1026240 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........

r1025150 | vkrause | 2009-09-18 09:49:04 +0200 (Fri, 18 Sep 2009) | 5 lines

Rename maildir files, ':' is not allowed on Windows, and adapt the reference
data accordingly.

BUG: 207699

........

r1025189 | vkrause | 2009-09-18 10:49:27 +0200 (Fri, 18 Sep 2009) | 5 lines

- Fetch the full payload, we want to index the body as well.
- Fix deadlock, Soprano query iterators need to be closed before we can
  do a write operation.
- Only fetch stuff that's already in the cache.

........

r1025221 | vkrause | 2009-09-18 11:03:21 +0200 (Fri, 18 Sep 2009) | 3 lines

Set the label so the person shows up with her name in krunner, not just
a random Nepomuk URI.

........

r1025233 | vkrause | 2009-09-18 11:09:07 +0200 (Fri, 18 Sep 2009) | 2 lines

Set the label for contact groups as well.

........

r1025281 | scripty | 2009-09-18 11:38:37 +0200 (Fri, 18 Sep 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r1025292 | tmcguire | 2009-09-18 11:56:43 +0200 (Fri, 18 Sep 2009) | 1 line

Remove/fix more KMail references.

........

r1025306 | mlaurent | 2009-09-18 12:35:11 +0200 (Fri, 18 Sep 2009) | 2 lines

Fix iterator

........

r1025319 | tmcguire | 2009-09-18 13:37:09 +0200 (Fri, 18 Sep 2009) | 4 lines

Add unit test for bug 207766, but it doesn't fail.

CCBUG: 207766

........

r1025336 | vkrause | 2009-09-18 14:48:15 +0200 (Fri, 18 Sep 2009) | 6 lines

- Use the vocabulary class instead of hand-written URIs. It's
  autogenerated but checked in for now as you'd need a patched
  ontology2vocabularyclass tool to not end up with invalid code
  for the NCAL ontotology (it creates a method called "class").
- Factor out some common stuff for all three incidence types.

........

r1025339 | tmcguire | 2009-09-18 15:05:23 +0200 (Fri, 18 Sep 2009) | 5 lines

Don't hardcode the config to KGlobal::config(), instead provide a ConfigProvider class
to get and set the config.

This is needed so KMail can use the same config when running standalone or in Kontact.

........

r1025341 | tmcguire | 2009-09-18 15:07:35 +0200 (Fri, 18 Sep 2009) | 3 lines

- Set the correct config for the message list with the new config provider
- Change all usages of KConfig* to KSharedConfig::Ptr

........

r1025370 | tokoe | 2009-09-18 16:44:34 +0200 (Fri, 18 Sep 2009) | 2 lines

Adapt plugins to new API (fixes compiler warnings)

........

r1025374 | tokoe | 2009-09-18 16:54:39 +0200 (Fri, 18 Sep 2009) | 4 lines

Remove 'Reload' action, it shouldn't be needed for the day-to-day usage

BUG: 207736

........

r1025375 | tokoe | 2009-09-18 16:55:17 +0200 (Fri, 18 Sep 2009) | 2 lines

Make the newContact() and newGroup() slot available in the part

........

r1025376 | tokoe | 2009-09-18 16:59:21 +0200 (Fri, 18 Sep 2009) | 4 lines

Forward the newContact()/newGroup() actions to the KAddressBook part.

BUG: 205744

........

r1025386 | winterz | 2009-09-18 17:51:57 +0200 (Fri, 18 Sep 2009) | 2 lines

increase KONTACT_PLUGIN_VERSION to 8 due to some changes in the interface.

........

r1025395 | tokoe | 2009-09-18 18:17:22 +0200 (Fri, 18 Sep 2009) | 3 lines

Set the WhatsThis of the KActionMenu correctly and use
convenience methods to add and remove actions.

........

r1025396 | tokoe | 2009-09-18 18:19:28 +0200 (Fri, 18 Sep 2009) | 4 lines

Add WhatsThis information to 'New Contact' and 'New Group' button.

BUG: 207701

........

r1025599 | scripty | 2009-09-19 11:19:05 +0200 (Sat, 19 Sep 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r1025735 | winterz | 2009-09-19 17:00:47 +0200 (Sat, 19 Sep 2009) | 2 lines

remove. no longer used. dead code.

........

r1025754 | cgiboudeaux | 2009-09-19 17:41:10 +0200 (Sat, 19 Sep 2009) | 1 line

Bump require.

........

r1025773 | sengels | 2009-09-19 18:42:10 +0200 (Sat, 19 Sep 2009) | 2 lines

using a const reference requires inclusion of header file (msvc++)
CCMAIL:kde-winbuild@kde.org

........

r1025953 | scripty | 2009-09-20 11:22:57 +0200 (Sun, 20 Sep 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r1025989 | tokoe | 2009-09-20 13:55:06 +0200 (Sun, 20 Sep 2009) | 5 lines

Use 'page-break-inside: avoid' to prevent entries to be
put on multiple pages, unfortunately neither QTextDocument
nor QtWebKit supports that CSS attribute yet...

........

r1025995 | tstaerk | 2009-09-20 14:51:29 +0200 (Sun, 20 Sep 2009) | 1 line

bump version

........

r1026047 | bettio | 2009-09-20 18:18:20 +0200 (Sun, 20 Sep 2009) | 2 lines

Replaced the KPassivePopup with a KNotification.

........

r1026062 | tstaerk | 2009-09-20 19:55:27 +0200 (Sun, 20 Sep 2009) | 7 lines

Some code cleanup, e.g. do setCaption next to oPenFile().
CCBUGS:194865
--Thi line, and those below, will be ignored--

M    ktimetracker/mainwindow.cpp
M    ktimetracker/timetrackerwidget.cpp

........

r1026180 | sengels | 2009-09-21 01:50:39 +0200 (Mon, 21 Sep 2009) | 2 lines

fix export of subclass (msvc++)
CCMAIL:kde-winbuild@kde.org

........

r1026234 | tstaerk | 2009-09-21 10:13:07 +0200 (Mon, 21 Sep 2009) | 5 lines

Allow handing over a parameter to work on a specific iCalendar file.
This stopped working when mainwindow became a mere KParts::MainWindow.
I guess this cost 24 man hours programming time.
BUGS:194865

........

r1026236 | tokoe | 2009-09-21 10:40:35 +0200 (Mon, 21 Sep 2009) | 2 lines

Set meaningful dialog caption

........

r1026240 | tokoe | 2009-09-21 10:55:07 +0200 (Mon, 21 Sep 2009) | 4 lines

Allow the user to print a contact's note in RingBinder style.

BUG: 207610

........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1026249

Details

Event Timeline

Volker Krause <vkrause@kde.org> committed rKLEOPATRAe1714c1fad55: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Sep 21 2009, 11:20 AM

Empty Commit

This commit is empty and does not affect any paths.