SVN_MERGE
Merged revisions 1058568,1058637,1058673,1059156,1059857,1059987,1060047,1060071,1060076,1060244,1060398-1060399,1060415,1060429,1060452,1060617,1060712,1060733-1060734,1060763-1060765 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1058568 | skelly | 2009-12-04 18:37:03 +0100 (Fri, 04 Dec 2009) | 3 lines
Check in the latest kreparentingproxymodel.
This implements support for rowsRemoved among other things now.
................
r1058637 | tokoe | 2009-12-04 21:52:47 +0100 (Fri, 04 Dec 2009) | 2 lines
SVN_SILENT krazy fixes
................
r1058673 | djarvie | 2009-12-04 23:14:39 +0100 (Fri, 04 Dec 2009) | 2 lines
Change date format in dialogue
................
r1059156 | golnazn | 2009-12-05 23:34:43 +0100 (Sat, 05 Dec 2009) | 1 line
BUG:#216909: Add support of <pre> tags in the post editor.
................
r1059857 | lueck | 2009-12-07 16:00:39 +0100 (Mon, 07 Dec 2009) | 2 lines
extract messages + load the catalog
CCMAIL:kde-i18n-doc@kde.org
................
r1059987 | tmcguire | 2009-12-07 21:53:36 +0100 (Mon, 07 Dec 2009) | 3 lines
Protect against event loop reentrancy.
Fixes crash on startup due to the ContactSearchJob
................
r1060047 | cgiboudeaux | 2009-12-08 00:16:13 +0100 (Tue, 08 Dec 2009) | 1 line
We now require Boost 1.34.0
................
r1060071 | djarvie | 2009-12-08 01:43:14 +0100 (Tue, 08 Dec 2009) | 2 lines
Bug 217456: fix date-only alarms triggering repeatedly at high frequency.
................
r1060076 | djarvie | 2009-12-08 01:56:05 +0100 (Tue, 08 Dec 2009) | 2 lines
Fix date-only alarms in akonadi resource
................
r1060244 | scripty | 2009-12-08 11:53:04 +0100 (Tue, 08 Dec 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r1060398 | nlecureuil | 2009-12-08 20:48:03 +0100 (Tue, 08 Dec 2009) | 3 lines
Fix crash when KTimetracker is in Kontact
BUG:217721
................
r1060399 | nlecureuil | 2009-12-08 20:56:26 +0100 (Tue, 08 Dec 2009) | 5 lines
Allow "new task" button to work when KTimeTracker is embeded in Kontact
and no document already exists
BUG:212725
................
r1060415 | winterz | 2009-12-08 22:17:13 +0100 (Tue, 08 Dec 2009) | 21 lines
Recorded merge of revisions 1060413 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1060413 | winterz | 2009-12-08 16:13:06 -0500 (Tue, 08 Dec 2009) | 14 lines
Merged revisions 1060410 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1060410 | winterz | 2009-12-08 16:04:46 -0500 (Tue, 08 Dec 2009) | 7 lines
merge SVN commit 1060407 by winterz from trunk:
Don't assert when adding a new Journal with attendees.
Looks like I'm adding a new string, but I'm not: I'm reusing a string from 4.3
MERGE: e4 (already in trunk)
........
................
................
r1060429 | djarvie | 2009-12-08 23:09:30 +0100 (Tue, 08 Dec 2009) | 1 line
Remove warning
................
r1060452 | pokrzywka | 2009-12-09 01:14:13 +0100 (Wed, 09 Dec 2009) | 1 line
added Boost_INCLUDEDIRS to some plugins which require boost::shared_ptr indirectly
................
r1060617 | scripty | 2009-12-09 12:42:13 +0100 (Wed, 09 Dec 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r1060712 | winterz | 2009-12-09 19:28:34 +0100 (Wed, 09 Dec 2009) | 19 lines
Blocked revisions 1060710 via svnmerge
................
r1060710 | winterz | 2009-12-09 13:27:11 -0500 (Wed, 09 Dec 2009) | 13 lines
Merged revisions 1060708 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1060708 | winterz | 2009-12-09 13:23:56 -0500 (Wed, 09 Dec 2009) | 6 lines
fix my previous commit for
"Don't assert when adding a new Journal with attendees."
I put the fix in the wrong place. This will teach me not to merge by-hand.
MERGE: e4
........
................
................
r1060733 | tokoe | 2009-12-09 20:37:58 +0100 (Wed, 09 Dec 2009) | 2 lines
Abort application if Akonadi couldn't be started
................
r1060734 | tokoe | 2009-12-09 20:38:29 +0100 (Wed, 09 Dec 2009) | 2 lines
Abort application if Akonadi couldn't be started
................
r1060763 | otrichet | 2009-12-09 21:34:19 +0100 (Wed, 09 Dec 2009) | 3 lines
Use the spell checker configuration of KNode instead of the global one.
BUG: 207767
................
r1060764 | otrichet | 2009-12-09 21:34:26 +0100 (Wed, 09 Dec 2009) | 1 line
useless code
................
r1060765 | otrichet | 2009-12-09 21:34:33 +0100 (Wed, 09 Dec 2009) | 3 lines
Remember if automatic spell checking is enabled or not
BUG: 123720
................
svn path=/branches/work/akonadi-ports/kdepim/; revision=1061100
Volker Krause