Merged revisions 1129080,1129082-1129083,1129088,1129139,1129149,1129184-1129185,1129190,1129206,1129210,1129212,1129226,1129232-1129233,1129257-1129258,1129384,1129486,1129520,1129689,1129745,1129819,1129823,1130073,1130076,1130090,1130092,1130094,1130125,1130127,1130136,1130145-1130146,1130159,1130172-1130174,1130231,1130236-1130237,1130261,1130270 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1129080 | smartins | 2010-05-21 11:50:29 +0200 (Fri, 21 May 2010) | 17 lines
Forward port from e35:
SVN commit 1128862 by tmcguire:
Make sure all day labels are of the same type.
Also, fix the long day label, it did never work because
of a faulty setText() reimplementation.
kolab/issue4286
---
SVN commit 1128886 by tmcguire:
Don't forget to call the base class' implementation.
................
r1129082 | smartins | 2010-05-21 11:59:56 +0200 (Fri, 21 May 2010) | 4 lines
port r1128986 by kainhofe:
KOrganizer's Birthdays: Fix leap year glitch when calculating bdays / anniversaries
................
r1129083 | tilladam | 2010-05-21 12:09:00 +0200 (Fri, 21 May 2010) | 2 lines
Make sure to go online again (at the resourcebase level) when we have
succesfully connected.
................
r1129088 | amantia | 2010-05-21 12:15:37 +0200 (Fri, 21 May 2010) | 1 line
Check if a message is in the outbox folder. If it is, don't remove the encryption when viewing it.
................
r1129139 | winterz | 2010-05-21 13:35:05 +0200 (Fri, 21 May 2010) | 13 lines
SVN_SILENT:
Blocked revisions 1129102,1129109 via svnmerge
........
r1129102 | tmcguire | 2010-05-21 06:48:20 -0400 (Fri, 21 May 2010) | 1 line
Update Newslog.txt
........
r1129109 | tmcguire | 2010-05-21 07:06:38 -0400 (Fri, 21 May 2010) | 1 line
SVN_SILENT Update version numbers for today's release.
........
................
r1129149 | smartins | 2010-05-21 14:07:58 +0200 (Fri, 21 May 2010) | 2 lines
Lots of stuff went into a private class inside .cpp file , so remove fwd declarations from .h .
................
r1129184 | amantia | 2010-05-21 16:50:22 +0200 (Fri, 21 May 2010) | 1 line
Return the top node if an empty url is passed, as ContentIndex::toString() for topLevel returns an empty string . Fixes invitation handling buttons.
................
r1129185 | krake | 2010-05-21 16:56:55 +0200 (Fri, 21 May 2010) | 2 lines
Add accessors for taglist
................
r1129190 | krake | 2010-05-21 16:58:12 +0200 (Fri, 21 May 2010) | 2 lines
When listing items of a collection, check for tags and set them in the job as a custom property
................
r1129206 | amantia | 2010-05-21 17:44:28 +0200 (Fri, 21 May 2010) | 1 line
Don't append the ical file twice to the response mails. Fix exchange compatible response, so they look lik in KMail1,
................
r1129210 | krake | 2010-05-21 18:05:58 +0200 (Fri, 21 May 2010) | 2 lines
Migrate message tag properties
................
r1129212 | smartins | 2010-05-21 18:18:01 +0200 (Fri, 21 May 2010) | 2 lines
Fix broken connect
................
r1129226 | krake | 2010-05-21 19:21:21 +0200 (Fri, 21 May 2010) | 2 lines
Recover tags for cached messages
................
r1129232 | krake | 2010-05-21 20:00:00 +0200 (Fri, 21 May 2010) | 2 lines
Only migrate tags we haven't migrated before
................
r1129233 | krake | 2010-05-21 20:00:23 +0200 (Fri, 21 May 2010) | 2 lines
Enable cache recovery
................
r1129257 | dfaure | 2010-05-21 21:06:13 +0200 (Fri, 21 May 2010) | 2 lines
make the kWarning more explicit about which attribute is actually missing
................
r1129258 | bbroeksema | 2010-05-21 21:08:06 +0200 (Fri, 21 May 2010) | 1 line
Disable IncidenceEditor-ng code in trunk for now
................
r1129384 | tokoe | 2010-05-22 08:47:07 +0200 (Sat, 22 May 2010) | 2 lines
Use explicit type to allow static code checking
................
r1129486 | smartins | 2010-05-22 17:01:23 +0200 (Sat, 22 May 2010) | 5 lines
Don't write back remote revision since we can't make sure it is the current one fixes problems with DAV resource.
Thanks tokoe.
................
r1129520 | smartins | 2010-05-22 20:18:30 +0200 (Sat, 22 May 2010) | 9 lines
Fix segfaults when history entries contain to-dos with references to deleted children.
The crash happens because a clone()d parent still has relations. If you have Parent1 with Child1, and do a Parent1.clone(), the clone will think
that Child1 is his child, but the child doesn't know the clone, so will never notify it when it gets deleted.
This could be fixed in KCal, i think either the clone has 0 relations or we clone the whole family recursively, currently we have an inbetween approach.
................
r1129689 | tilladam | 2010-05-23 13:10:04 +0200 (Sun, 23 May 2010) | 1 line
Don't delete the kernel's identity manager. Off by not.
................
r1129745 | otrichet | 2010-05-23 17:48:45 +0200 (Sun, 23 May 2010) | 4 lines
In the group view, force the default column to sort by.
Forward port to trunk: Group order confusing after adding new groups
CCBUG: 232494
................
r1129819 | smartins | 2010-05-23 23:11:04 +0200 (Sun, 23 May 2010) | 2 lines
Don't cache invalid dates
................
r1129823 | smartins | 2010-05-23 23:25:20 +0200 (Sun, 23 May 2010) | 4 lines
When the parent arrives, tell the orphan children.
Fixes todos sometimes appearing as independent instead of under a parent.
................
r1130073 | mlaurent | 2010-05-24 13:37:57 +0200 (Mon, 24 May 2010) | 2 lines
not necessary to show collection location when it's a search folder
................
r1130076 | winterz | 2010-05-24 13:45:02 +0200 (Mon, 24 May 2010) | 11 lines
SVN_SILENT:
Recorded merge of revisions 1128965 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1128965 | winterz | 2010-05-20 15:59:13 -0400 (Thu, 20 May 2010) | 3 lines
a better way of reading X-SUMMARY and X-LOCATION freebusy parameters.
MERGE: trunk
........
................
r1130090 | mlaurent | 2010-05-24 14:34:07 +0200 (Mon, 24 May 2010) | 2 lines
Clean up
................
r1130092 | mlaurent | 2010-05-24 14:39:43 +0200 (Mon, 24 May 2010) | 2 lines
not necessary with akonadi
................
r1130094 | mlaurent | 2010-05-24 14:48:24 +0200 (Mon, 24 May 2010) | 3 lines
Const'ify
Return error when we can't delete messages
................
r1130125 | skelly | 2010-05-24 16:36:16 +0200 (Mon, 24 May 2010) | 1 line
Make the sort order in the tree the same as the order in the rendered content.
................
r1130127 | tokoe | 2010-05-24 16:38:29 +0200 (Mon, 24 May 2010) | 4 lines
Print organization and title/role in detailed style
BUG: 235177
................
r1130136 | skelly | 2010-05-24 17:03:53 +0200 (Mon, 24 May 2010) | 1 line
Save and restore kjots viewstate across restarts.
................
r1130145 | skelly | 2010-05-24 17:32:11 +0200 (Mon, 24 May 2010) | 3 lines
Set dynamicSortFilter to true.
I don't know why this is false by default.
................
r1130146 | skelly | 2010-05-24 17:32:13 +0200 (Mon, 24 May 2010) | 1 line
Set dynamicSortFilter to true.
................
r1130159 | smartins | 2010-05-24 18:27:44 +0200 (Mon, 24 May 2010) | 2 lines
fix typo reported by Frederik Schwarzer
................
r1130172 | skelly | 2010-05-24 18:54:27 +0200 (Mon, 24 May 2010) | 1 line
Use the static methods instead of the old match() method.
................
r1130173 | skelly | 2010-05-24 18:54:29 +0200 (Mon, 24 May 2010) | 1 line
Ensure that the parent collection can be found if available.
................
r1130174 | skelly | 2010-05-24 18:54:31 +0200 (Mon, 24 May 2010) | 1 line
Fix off-by-one that occurs when moving items down the list.
................
r1130231 | mlaurent | 2010-05-24 21:49:24 +0200 (Mon, 24 May 2010) | 2 lines
Fix includes
................
r1130236 | mlaurent | 2010-05-24 22:02:51 +0200 (Mon, 24 May 2010) | 2 lines
Don't show path when it's a virtual folder
................
r1130237 | mlaurent | 2010-05-24 22:11:20 +0200 (Mon, 24 May 2010) | 2 lines
Use kDebug
................
r1130261 | otrichet | 2010-05-24 23:18:48 +0200 (Mon, 24 May 2010) | 1 line
Display news article like message/rfc2822 in akonadiconsole
................
r1130270 | otrichet | 2010-05-24 23:51:13 +0200 (Mon, 24 May 2010) | 1 line
Fix header display of the "all headers" style
................
svn path=/branches/work/komo/kdepim/; revision=1130358
to be ifdef'ed out is KMail::FolderRequester, which should move to
libakonadi for 4.6 IMHO. The rest is minor KMKernel and GlobalSettings
stuff which is all reasonably easy to get rid of eventually.
svn path=/trunk/KDE/kdepim/kmail/; revision=1128786
that is configuredialog.cpp. Gives me at least a chance to see if it is
feasible to reuse this code.
svn path=/trunk/KDE/kdepim/kmail/; revision=1128498
Volker Krause
Till Adam