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
Now, the "check mail" menu is properly updated after the name of an
agent instance is updated, since it does not rely on on the map in
KMAgentManager anymore, which got out-of-date.
svn path=/trunk/KDE/kdepim/kmail/; revision=1110650
Merged revisions 1067234 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r1067234 | tmcguire | 2009-12-29 11:39:25 +0100 (Tue, 29 Dec 2009) | 6 lines
Extract the function used for looking up the icon file name.
Use that function for TNef attachments as well.
Fixes a crash when encountring a TNef attachment with an unknown
mimetype (and displays the correct icon now, even)
........
svn path=/trunk/KDE/kdepim/; revision=1071361
Use that function for TNef attachments as well.
Fixes a crash when encountring a TNef attachment with an unknown
mimetype (and displays the correct icon now, even)
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1067234
Now all changes in kmail/stringutils which come from trunk must be apply in messageviewer/stringutils
svn path=/branches/work/akonadi-ports/kdepim/; revision=1041766
------------------------------------------------------------------------
r997532 | tmcguire | 2009-07-16 00:52:35 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r997204 by mlaurent from trunk to the enterprise4 branch:
Fix kolab issue 3739
(Inform when we use a distribution list empty)
and fix duplication code.
------------------------------------------------------------------------
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1001140
------------------------------------------------------------------------
r997532 | tmcguire | 2009-07-16 00:52:35 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r997204 by mlaurent from trunk to the enterprise4 branch:
Fix kolab issue 3739
(Inform when we use a distribution list empty)
and fix duplication code.
------------------------------------------------------------------------
svn path=/branches/kdepim/enterprise4/kdepim/; revision=998236
Fix kolab issue 3739
(Inform when we use a distribution list empty)
and fix duplication code.
svn path=/branches/kdepim/enterprise4/kdepim/; revision=997532
Merged revisions 993251,993269-993270,993305,993311,993326,993338,993446,993450,993461-993464,993472,993474,993477,993480,993495,993501,993515,993518,993520,993522,993531,993542,993545,993550,993557,993561,993573,993582,993591,993599,993629,993641,993738,993741-993742,993746,993846,993878,993906,993963-993964,993970,994012,994017,994063,994093,994129,994223,994262,994339,994382,994441,994459,994532 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r993251 | trueg | 2009-07-08 12:46:00 +0200 (Wed, 08 Jul 2009) | 3 lines
Nepomuk rcgen cleanup first step (or rather fourth or something considering tokoe's amazing work before):
- disabling templates. we do not use them anyway and they will be deprecated soon.
........
r993269 | skelly | 2009-07-08 13:14:13 +0200 (Wed, 08 Jul 2009) | 1 line
Make sure tests includes are available.
........
r993270 | skelly | 2009-07-08 13:14:17 +0200 (Wed, 08 Jul 2009) | 2 lines
Break the main window into a tabbed interface for multiple proxy model
tests.
........
r993305 | lueck | 2009-07-08 14:52:34 +0200 (Wed, 08 Jul 2009) | 1 line
typo fix
........
r993311 | winterz | 2009-07-08 15:08:11 +0200 (Wed, 08 Jul 2009) | 9 lines
Refinement of import/export of kaddressbook from/to GMX.
Patch entirely from Urs Joss. Thanks!
Joss, please close the review board request for this as closed.
Remember: we need to also put this into kcontactmanager.
http://reviewboard.kde.org/r/941
CCMAIL: tschenturs@gmx.ch
........
r993326 | djarvie | 2009-07-08 15:42:42 +0200 (Wed, 08 Jul 2009) | 1 line
Move methods out of base class
........
r993338 | vkrause | 2009-07-08 16:00:53 +0200 (Wed, 08 Jul 2009) | 4 lines
Birthday resources can have different settings, so it does not make
sense to only allow one instance. Should help with the migration problem
David is seeing.
........
r993446 | skelly | 2009-07-08 19:47:31 +0200 (Wed, 08 Jul 2009) | 6 lines
Add another configuration use for the selection proxy model.
This is getting cumbersome, so I will soon change the API and refactor
the internals.
There are also some remaining nagging bugs.
........
r993450 | skelly | 2009-07-08 19:50:58 +0200 (Wed, 08 Jul 2009) | 1 line
Enable akonadi_next to be built standalone.
........
r993461 | skelly | 2009-07-08 20:12:46 +0200 (Wed, 08 Jul 2009) | 1 line
Start some support for AmazingCompletion(tm)
........
r993462 | skelly | 2009-07-08 20:12:50 +0200 (Wed, 08 Jul 2009) | 4 lines
Create a sane implementation od AbstractProxyModelMatch.
This should be in QAbstractProxyModel. I'll patch it there later and
send a merge request upstream.
........
r993463 | skelly | 2009-07-08 20:12:53 +0200 (Wed, 08 Jul 2009) | 2 lines
Implement match for the ContactsModel. Will allow matching Amazingly
eventually.
........
r993464 | skelly | 2009-07-08 20:12:57 +0200 (Wed, 08 Jul 2009) | 1 line
Reimplement match.
........
r993472 | skelly | 2009-07-08 20:25:04 +0200 (Wed, 08 Jul 2009) | 1 line
Better match implementation.
........
r993474 | tmcguire | 2009-07-08 20:33:31 +0200 (Wed, 08 Jul 2009) | 4 lines
Prevent an infinite recursion when entering a new folder with at least one message.
Curiously, this is very similar to kolab/issue3727
........
r993477 | skelly | 2009-07-08 20:39:54 +0200 (Wed, 08 Jul 2009) | 1 line
Really fix matching this time.
........
r993480 | mleupold | 2009-07-08 20:51:54 +0200 (Wed, 08 Jul 2009) | 1 line
Fix/hide various krazy issues including most qclasses, QLatin1String and kdebug.
........
r993495 | bbroeksema | 2009-07-08 21:39:29 +0200 (Wed, 08 Jul 2009) | 2 lines
Krazy fixes: Use const references instead of const values in Q_FOREACH.
........
r993501 | mlaurent | 2009-07-08 21:44:23 +0200 (Wed, 08 Jul 2009) | 2 lines
compile++
........
r993515 | tstaerk | 2009-07-08 22:18:36 +0200 (Wed, 08 Jul 2009) | 1 line
karm->ktimetracker && dcop->dbus
........
r993518 | tstaerk | 2009-07-08 22:30:55 +0200 (Wed, 08 Jul 2009) | 1 line
karm->ktimetracker && dcop->dbus
........
r993520 | cgiboudeaux | 2009-07-08 22:41:32 +0200 (Wed, 08 Jul 2009) | 1 line
SVN_SILENT Cleanup
........
r993522 | cgiboudeaux | 2009-07-08 22:42:49 +0200 (Wed, 08 Jul 2009) | 1 line
Cleanup
........
r993531 | tstaerk | 2009-07-08 22:53:34 +0200 (Wed, 08 Jul 2009) | 1 line
What you never wanted to know about ktimetracker, but were forced to learn anyway--
........
r993542 | bbroeksema | 2009-07-08 23:06:33 +0200 (Wed, 08 Jul 2009) | 2 lines
Krazy fixes: null string assign -> clear()
........
r993545 | bbroeksema | 2009-07-08 23:19:38 +0200 (Wed, 08 Jul 2009) | 2 lines
SVN_SILENT: fix two small spelling errors in comments.
........
r993550 | cgiboudeaux | 2009-07-08 23:29:37 +0200 (Wed, 08 Jul 2009) | 1 line
Partially revert of r967753. Only kresources and plugins must be built after the optional applications.
........
r993557 | bbroeksema | 2009-07-08 23:36:51 +0200 (Wed, 08 Jul 2009) | 2 lines
Fix krazy issues: QLatin1String
........
r993561 | cgiboudeaux | 2009-07-08 23:39:10 +0200 (Wed, 08 Jul 2009) | 1 line
SVN_SILENT Cleanup
........
r993573 | bbroeksema | 2009-07-09 00:02:53 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993582 | bbroeksema | 2009-07-09 00:25:27 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993591 | bbroeksema | 2009-07-09 01:02:21 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993599 | winterz | 2009-07-09 02:32:58 +0200 (Thu, 09 Jul 2009) | 3 lines
compile++
add cstdlib header for exit()
........
r993629 | bbroeksema | 2009-07-09 09:04:53 +0200 (Thu, 09 Jul 2009) | 2 lines
Revert part of r993495 because Protocol is an enum. Let krazy ignore these lines.
........
r993641 | bbroeksema | 2009-07-09 10:42:09 +0200 (Thu, 09 Jul 2009) | 4 lines
Reduce reloads of resources based on the SingleFileResource by using hashes of
the file. This commit prevents reloads of resources based on singlefileresource
when the resource is writing changes to the file itself.
........
r993738 | pokrzywka | 2009-07-09 14:26:52 +0200 (Thu, 09 Jul 2009) | 1 line
nicer fix for the --templates bug in nepomuk_rcgen: only add the option if there are templates specified. Not sure if that will ever be needed again though, but it doesn't hurt for now.
........
r993741 | djarvie | 2009-07-09 14:35:19 +0200 (Thu, 09 Jul 2009) | 1 line
Fix compile warning
........
r993742 | winterz | 2009-07-09 14:46:42 +0200 (Thu, 09 Jul 2009) | 6 lines
Go crazy with node validity checks to try and fix all the crash reports that I can't reproduce.
Might fix
CCBUG: 198961
MERGE: e4,4.3
........
r993746 | pokrzywka | 2009-07-09 14:51:40 +0200 (Thu, 09 Jul 2009) | 3 lines
fixed the build problems with the nepomuk agents on windows. The generated files now handle static linking.
CCMAIL:till@kdab.net
........
r993846 | winterz | 2009-07-09 17:11:23 +0200 (Thu, 09 Jul 2009) | 7 lines
Urs' cleanups
Add Urs to copyright.
I'll copy this into kcontactmanager.
MERGE: e4
........
r993878 | scripty | 2009-07-09 17:42:19 +0200 (Thu, 09 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r993906 | jtamate | 2009-07-09 18:58:08 +0200 (Thu, 09 Jul 2009) | 3 lines
BUG: 192897
Added "at the bottom of the Security tab in this dialog" to the message.
........
r993963 | bbroeksema | 2009-07-09 22:20:13 +0200 (Thu, 09 Jul 2009) | 2 lines
Fix krazy issues: Proper include directives.
........
r993964 | bbroeksema | 2009-07-09 22:24:44 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fix: single-char QString operations
........
r993970 | bbroeksema | 2009-07-09 22:29:56 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fix: C++ ctors that should be declared 'explicit'
........
r994012 | bbroeksema | 2009-07-10 00:01:00 +0200 (Fri, 10 Jul 2009) | 2 lines
Krazy fixes: validity of i18n calls.
........
r994017 | bbroeksema | 2009-07-10 00:07:32 +0200 (Fri, 10 Jul 2009) | 3 lines
Krazy fix: [foreach[ This is not a call to keys of a map or set, but to a
std::vector. Ignore this one.
........
r994063 | winterz | 2009-07-10 04:16:56 +0200 (Fri, 10 Jul 2009) | 4 lines
fix spacing between the pixmap and the urllabel
BUG: 199598
MERGE: e4,4.3
........
r994093 | mlaurent | 2009-07-10 09:10:16 +0200 (Fri, 10 Jul 2009) | 2 lines
Apply patch
........
r994129 | trueg | 2009-07-10 11:15:40 +0200 (Fri, 10 Jul 2009) | 4 lines
Moved NepomukAddOntologyClasses to kdelibs. No need for a local copy anymore.
Also by default rcgen will not export classes anymore. Thus, there is no need
for the define anymore.
........
r994223 | vkrause | 2009-07-10 13:59:23 +0200 (Fri, 10 Jul 2009) | 3 lines
No need to try to migrate the not yet/no longer supported file formats
of the KABC file resource in every run.
........
r994262 | djarvie | 2009-07-10 15:36:32 +0200 (Fri, 10 Jul 2009) | 4 lines
Refactor to remove dependencies in KAEvent, KARecurrence and AlarmText on KAlarm
preferences, in preparation for Akonadi migration.
All KAEvent data independent of preferences is not in KAEventData.
........
r994339 | ervin | 2009-07-10 16:35:40 +0200 (Fri, 10 Jul 2009) | 2 lines
Let's allow people to type in the KDateEdit. Okay? :-)
........
r994382 | djarvie | 2009-07-10 16:51:41 +0200 (Fri, 10 Jul 2009) | 1 line
Fix alarms not being triggered if reminders occur AFTER the main alarm
........
r994441 | scripty | 2009-07-10 17:19:10 +0200 (Fri, 10 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r994459 | cgiboudeaux | 2009-07-10 17:37:43 +0200 (Fri, 10 Jul 2009) | 1 line
SVN_SILENT Remove the extra comma
........
r994532 | vkrause | 2009-07-10 19:36:12 +0200 (Fri, 10 Jul 2009) | 4 lines
Use the recently introduced server-side collection content mimetype
filtering. This fixes Kolab collections not showing up in eg.
KContactManager.
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=994567
Laurent Montel
Thomas McGuire
Volker Krause
Till Adam
Leo Franchi
Tobias Koenig
Andrew Coles
Michael Leupold