Merged revisions 1067418,1067507,1067528,1067701,1067840,1068120,1068176,1068311,1068594,1068742,1068747,1069016,1069028-1069029,1069033,1069207,1069386,1069513,1069679,1069684,1069958,1069987-1069988,1070004,1070028,1070061,1070073 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1067418 | tokoe | 2009-12-29 16:36:20 +0100 (Tue, 29 Dec 2009) | 2 lines
Use the brand new ldap icon
................
r1067507 | tmcguire | 2009-12-29 19:10:16 +0100 (Tue, 29 Dec 2009) | 115 lines
Block cyclic merges, blocks, release stuff.
SVN_MERGE
SVN_SILENT
Blocked revisions 1062964,1063082,1063116,1063422,1063485,1063502,1064260,1066656 via svnmerge
................
r1062964 | ludwigreiter | 2009-12-16 13:48:07 +0100 (Wed, 16 Dec 2009) | 2 lines
Update after newslog 2009-12-04 test.
................
r1063082 | winterz | 2009-12-16 23:24:13 +0100 (Wed, 16 Dec 2009) | 18 lines
Merged revisions 1063007 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1063007 | tmcguire | 2009-12-16 12:34:12 -0500 (Wed, 16 Dec 2009) | 12 lines
kolab/issue3996
MERGE: e4
SVN_MERGE
Crossport r1028779 by tmcguire from trunk to the enterprise35 branch:
Use KMime to find the subject, so we can deal properly with non-ascii chars
or folded headers.
Please review, is the ' ' to '_' conversion still required? I left that out...
........
................
r1063116 | winterz | 2009-12-17 01:27:39 +0100 (Thu, 17 Dec 2009) | 14 lines
Blocked revisions 1063115 via svnmerge
........
r1063115 | winterz | 2009-12-16 19:25:34 -0500 (Wed, 16 Dec 2009) | 8 lines
when a new attendee is added to an event, make sure to increment
the revision number of the incidence passed to the existing
attendees is properly incremented.
Found while working on kolab/issue3988
MERGE: none (already in e4 and trunk)
........
................
r1063422 | winterz | 2009-12-18 15:21:16 +0100 (Fri, 18 Dec 2009) | 18 lines
Blocked revisions 1063418,1063421 via svnmerge
........
r1063418 | winterz | 2009-12-18 09:17:27 -0500 (Fri, 18 Dec 2009) | 7 lines
in prettifyQuotaError, don't assert if the folder for the specified job is 0.
simply return instead. this is how it's done in e4 and trunk.
kolab/issue4003
MERGE: none
........
r1063421 | winterz | 2009-12-18 09:20:02 -0500 (Fri, 18 Dec 2009) | 4 lines
in prettifiyQuotaError, return _error instead of error if folder is 0
MERGE: none
........
................
r1063485 | tmcguire | 2009-12-18 18:05:35 +0100 (Fri, 18 Dec 2009) | 1 line
Update Newslog.txt
................
r1063502 | tmcguire | 2009-12-18 18:39:42 +0100 (Fri, 18 Dec 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
................
r1064260 | winterz | 2009-12-20 14:15:48 +0100 (Sun, 20 Dec 2009) | 32 lines
Blocked revisions 1061391,1062472,1063456,1063482,1063501 via svnmerge
........
r1061391 | tmcguire | 2009-12-11 11:10:12 -0500 (Fri, 11 Dec 2009) | 1 line
SVN_SILENT just a test commit for svnmerge
........
r1062472 | winterz | 2009-12-14 16:20:32 -0500 (Mon, 14 Dec 2009) | 9 lines
Put the Todo View Group settings below the Month View Group settings
to save horizontal space, at the expense of vertical space.
This does look better, but I hope it isn't too tall.
I measure about 700px high with my font setting.
kolab/issue3994
MERGE: none
........
r1063456 | tmcguire | 2009-12-18 10:54:38 -0500 (Fri, 18 Dec 2009) | 4 lines
Add missing endl's.
SVN_SILENT
MERGE: none
........
r1063482 | tmcguire | 2009-12-18 11:54:07 -0500 (Fri, 18 Dec 2009) | 2 lines
Update Newslog.txt
........
r1063501 | tmcguire | 2009-12-18 12:39:39 -0500 (Fri, 18 Dec 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
........
................
r1066656 | tmcguire | 2009-12-27 17:34:16 +0100 (Sun, 27 Dec 2009) | 4 lines
Port the async crash test from trunk to e4.
MERGE: none
................
................
r1067528 | tmcguire | 2009-12-29 19:44:22 +0100 (Tue, 29 Dec 2009) | 26 lines
Tobias, how does the contact group editor in the new KAddressbook handle completion
of members, does it offer to complete to other contact group? Or does it disallow this?
Or are recursive contact groups allowed now?
CCMAIL: tokoe@kde.org
--
Block this commit, KAddressbook has a completely new contact group editor now.
SVN_SILENT
SVN_MERGE
Blocked revisions 1065582 via svnmerge
................
r1065582 | winterz | 2009-12-23 20:10:32 +0100 (Wed, 23 Dec 2009) | 11 lines
Merged revisions 1065538 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1065538 | tmcguire | 2009-12-23 10:47:35 -0500 (Wed, 23 Dec 2009) | 4 lines
Don't allow to add distribution lists to distribution lists, that doesn't work.
kolab/issue3929
........
................
................
r1067701 | scripty | 2009-12-30 12:43:45 +0100 (Wed, 30 Dec 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r1067840 | skelly | 2009-12-30 19:20:04 +0100 (Wed, 30 Dec 2009) | 1 line
Add the other missing explicits.
................
r1068120 | scripty | 2009-12-31 12:37:33 +0100 (Thu, 31 Dec 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r1068176 | ltoscano | 2009-12-31 14:47:39 +0100 (Thu, 31 Dec 2009) | 4 lines
Typo fix.
CCMAIL: kde-i18n-doc@kde.org
................
r1068311 | rdieter | 2009-12-31 21:02:01 +0100 (Thu, 31 Dec 2009) | 2 lines
add awol Type= key
................
r1068594 | otrichet | 2010-01-01 18:03:00 +0100 (Fri, 01 Jan 2010) | 1 line
Correct krazy exclusion
................
r1068742 | tmcguire | 2010-01-01 23:54:05 +0100 (Fri, 01 Jan 2010) | 17 lines
Don't allow some actions like select next unread message when the model
hasn't been loaded yet.
This fixes the source of the most crashes for me, which happen when quickly
pressing + after selecting a folder (and the folder is still loading)
The problem is that the model is in 'disconnected UI' mode, which means
mModelForItemFunctions is 0, and therefore index() returns an invalid index,
leading to an assert in e.g. messageItemAfter().
Szymon, are you still alive? :)
If so, can you tell us if the model is supposed to be disconnected at this
point and if this is the right fix?
I have the feeling it is a regression, but I'm not sure.
CCMAIL: pragma@kvirc.net
................
r1068747 | tmcguire | 2010-01-01 23:58:32 +0100 (Fri, 01 Jan 2010) | 3 lines
Revert temp. porting code, KMail can switch the theme even without the
header shown, in the View menu.
................
r1069016 | krake | 2010-01-02 15:46:47 +0100 (Sat, 02 Jan 2010) | 2 lines
Adapt usage of mimetype visitor after final move in Revision 1069015
................
r1069028 | cgiboudeaux | 2010-01-02 16:29:56 +0100 (Sat, 02 Jan 2010) | 1 line
look for kdelibs only if this is directory is built standalone (is this really needed, anyway?)
................
r1069029 | cgiboudeaux | 2010-01-02 16:30:53 +0100 (Sat, 02 Jan 2010) | 1 line
Remove non-existing include.
................
r1069033 | cgiboudeaux | 2010-01-02 16:42:39 +0100 (Sat, 02 Jan 2010) | 1 line
Fix link.
................
r1069207 | tstaerk | 2010-01-02 23:59:35 +0100 (Sat, 02 Jan 2010) | 7 lines
Show a description next to the toolbar items. That is especially important if
you have an internet table, i.e. a computer without a mouse but with a
touchscreen.
BUGS:182312
................
r1069386 | tstaerk | 2010-01-03 12:06:56 +0100 (Sun, 03 Jan 2010) | 1 line
Act on close. This is a game of inches :(
................
r1069513 | fthieme | 2010-01-03 16:52:03 +0100 (Sun, 03 Jan 2010) | 1 line
changed deprecated function call
................
r1069679 | tstaerk | 2010-01-04 04:04:08 +0100 (Mon, 04 Jan 2010) | 1 line
I could not sleep.
................
r1069684 | tstaerk | 2010-01-04 05:38:37 +0100 (Mon, 04 Jan 2010) | 1 line
Do not cover the ksearchtreewidgetlineedit.
................
r1069958 | vkrause | 2010-01-04 15:43:33 +0100 (Mon, 04 Jan 2010) | 13 lines
SVN_MERGE
i18n changes excluded from the merge
Merged revisions 1065241 via svnmerge from
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepim
........
r1065241 | tilladam | 2009-12-22 21:08:17 +0100 (Tue, 22 Dec 2009) | 1 line
The strigi backend we need was renamed, follow the name change.
........
................
r1069987 | cgiboudeaux | 2010-01-04 17:50:33 +0100 (Mon, 04 Jan 2010) | 1 line
prepare for RC1
................
r1069988 | tstaerk | 2010-01-04 17:53:00 +0100 (Mon, 04 Jan 2010) | 1 line
Fixing typo
................
r1070004 | tokoe | 2010-01-04 18:22:49 +0100 (Mon, 04 Jan 2010) | 2 lines
Make editing/deleting of contacts work with OX/6
................
r1070028 | tstaerk | 2010-01-04 19:49:56 +0100 (Mon, 04 Jan 2010) | 1 line
Will not be included in 4.4, is a incubator for the next release.
................
r1070061 | tstaerk | 2010-01-04 20:55:12 +0100 (Mon, 04 Jan 2010) | 1 line
Set window title.
................
r1070073 | tstaerk | 2010-01-04 21:10:41 +0100 (Mon, 04 Jan 2010) | 1 line
code cleanup
................
svn path=/branches/work/akonadi-ports/kdepim/; revision=1070391
part formatter kmail plugins have to become body part formatter message
viewer plugins.
This commit just does that, and allows to carry the originating akonadi
item for a given body part.
Should be enough to port the invitation handling to akonadi (as it's
handled through a body part formatter plugin).
svn path=/branches/work/akonadi-ports/kdepim/; revision=1059803
Merged revisions 1046627,1046735,1046774,1046776,1046999 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1046627 | scripty | 2009-11-09 11:35:14 +0100 (Mon, 09 Nov 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1046735 | ervin | 2009-11-09 16:40:41 +0100 (Mon, 09 Nov 2009) | 5 lines
Let the ImapAccount manage all the sessions. Extra sessions can be
queried by name and are created on demand. When the account is
disconnected, the class now takes care of disconnecting all the sessions
at once.
........
r1046774 | ervin | 2009-11-09 18:13:42 +0100 (Mon, 09 Nov 2009) | 4 lines
Put the password management and querying facilities completely into the
Settings class. Refactor the code to make it asynchronous so that the
resource doesn't stay blocked by a dialog.
........
r1046776 | ervin | 2009-11-09 18:21:00 +0100 (Mon, 09 Nov 2009) | 3 lines
Properly guard against requests which would come while the session is
unavailable. Retrievals are cancelled, while modifications are deferred.
........
r1046999 | ervin | 2009-11-10 09:56:06 +0100 (Tue, 10 Nov 2009) | 4 lines
Automatically subscribe to newly created mailboxes.
BUG: 211867
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1047005
Merged revisions 1044997,1045147,1045235,1045244,1045266 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1044997 | vkrause | 2009-11-05 09:17:44 +0100 (Thu, 05 Nov 2009) | 2 lines
ignore warnings of generated and 3rd-party code
........
r1045147 | scripty | 2009-11-05 12:43:31 +0100 (Thu, 05 Nov 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1045235 | vkrause | 2009-11-05 15:36:17 +0100 (Thu, 05 Nov 2009) | 3 lines
Keep encryption details around a bit longer, so we know what part was
encrypted with what key when doing the indexing.
........
r1045244 | vkrause | 2009-11-05 16:32:50 +0100 (Thu, 05 Nov 2009) | 4 lines
Create one index per encryption key, when using encrypted indexes. Seems
to work, ie. we get one Nepomuk database per key, not actually encrypted
yet of course, that's next.
........
r1045266 | tokoe | 2009-11-05 17:33:07 +0100 (Thu, 05 Nov 2009) | 4 lines
Save/restore the field selection when skipping the first row
BUG: 213160
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1045539
Volker Krause
Script Kiddy
Kevin Ottens
David Jarvie