SVN_MERGE
Merged revisions 1071274 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1071274 | tmcguire | 2010-01-07 20:55:41 +0100 (Thu, 07 Jan 2010) | 17 lines
SVN_MERGE
Merged revisions 1055367 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1055367 | winterz | 2009-11-27 22:36:12 +0100 (Fri, 27 Nov 2009) | 9 lines
Merged revisions 1055262 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1055262 | tmcguire | 2009-11-27 13:05:49 -0500 (Fri, 27 Nov 2009) | 2 lines
When the attachment has no name, name it "Attachment %1", so that it does not appear empty in the composer.
........
................
................
svn path=/branches/work/akonadi-ports/kdepim/; revision=1073639
Merged revisions 1055367 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1055367 | winterz | 2009-11-27 22:36:12 +0100 (Fri, 27 Nov 2009) | 9 lines
Merged revisions 1055262 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1055262 | tmcguire | 2009-11-27 13:05:49 -0500 (Fri, 27 Nov 2009) | 2 lines
When the attachment has no name, name it "Attachment %1", so that it does not appear empty in the composer.
........
................
svn path=/trunk/KDE/kdepim/; revision=1071274
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
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1055262 | tmcguire | 2009-11-27 13:05:49 -0500 (Fri, 27 Nov 2009) | 2 lines
When the attachment has no name, name it "Attachment %1", so that it does not appear empty in the composer.
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1055367
use to parse the source message. This still needs some cleanup by
someone who actually knows the template parser though.
svn path=/branches/work/akonadi-ports/kdepim/; revision=1047484
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
Don't update if you don't want to fix it. If you still do, disable kmail from compilation.
And never try to run it on important data. ;)
svn path=/branches/work/akonadi-ports/kdepim/; revision=1036843
Do not merge into the tag, string changes.
--
Crossport r986306 by tmcguire from trunk to the enterprise35 branch:
Merged revisions 966821 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r966821 | tmcguire | 2009-05-12 00:35:10 +0200 (Tue, 12 May 2009) | 8 lines
When inline forwarding a message, include the CCs as well by default.
For this, a new template command OADDRESSEESADDR was added.
Thanks to David "Usability" Faure for suggesting this.
Note to self: When porting to trunk, use "templates.diff" in your KMail dir,
to avoid conflicts.
........
svn path=/branches/kdepim/enterprise/kdepim/; revision=1021490
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1006884 | winterz | 2009-08-04 12:57:34 -0400 (Tue, 04 Aug 2009) | 4 lines
merge SVN commit 1006866 by tmcguire from trunk to e35:
Upps, don't include attachments when replying. Makes me wonder why this works in the other branches.
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1006911
Upps, don't include attachments when replying. Makes me wonder why this works in the other branches.
svn path=/branches/kdepim/enterprise/kdepim/; revision=1006884
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1004776 | winterz | 2009-07-30 16:40:43 -0400 (Thu, 30 Jul 2009) | 8 lines
merge SVN commit 1004765 by tmcguire from trunk to e35:
Make it work properly, before it quoted the wrong message.
Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1004784
Make it work properly, before it quoted the wrong message.
Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.
svn path=/branches/kdepim/enterprise/kdepim/; revision=1004776
Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.
MERGE: e35, e4
svn path=/trunk/KDE/kdepim/; revision=1004765
Merged revisions 1004635 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1004635 | tmcguire | 2009-07-30 18:48:44 +0200 (Thu, 30 Jul 2009) | 13 lines
Merged revisions 1004609 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1004609 | tmcguire | 2009-07-30 17:45:49 +0200 (Thu, 30 Jul 2009) | 6 lines
Share the object tree in the template parser when doing operations on it.
This removes unnecessary parsing of the object tree, which would lead to multiple passphrase dialogs.
MERGE: e4, trunk
kolab/issue3725
........
................
svn path=/trunk/KDE/kdepim/; revision=1004747
Merged revisions 1001281 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1001281 | winterz | 2009-07-22 21:50:57 +0200 (Wed, 22 Jul 2009) | 13 lines
Merged revisions 1001272 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1001272 | tmcguire | 2009-07-22 15:31:05 -0400 (Wed, 22 Jul 2009) | 5 lines
Parse the mime tree before collecting attachments.
This fixes the problem that forwarding encryped mails did not work as expected.
kolab/issue3725
MERGE: e4,trunk,4.3
........
................
svn path=/trunk/KDE/kdepim/; revision=1004677
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1004609 | tmcguire | 2009-07-30 17:45:49 +0200 (Thu, 30 Jul 2009) | 6 lines
Share the object tree in the template parser when doing operations on it.
This removes unnecessary parsing of the object tree, which would lead to multiple passphrase dialogs.
MERGE: e4, trunk
kolab/issue3725
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1004635
This removes unnecessary parsing of the object tree, which would lead to multiple passphrase dialogs.
MERGE: e4, trunk
kolab/issue3725
svn path=/branches/kdepim/enterprise/kdepim/; revision=1004609
Merged revisions 999615-999625,999627,999630,999658,999674,999758,999760,999765,999879,999883,1000002 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r999615 | skelly | 2009-07-20 11:41:05 +0200 (Mon, 20 Jul 2009) | 1 line
Clean up a little bit of finding the first row.
........
r999616 | skelly | 2009-07-20 11:41:08 +0200 (Mon, 20 Jul 2009) | 1 line
Only retrieve the row from the ModelIndex once.
........
r999617 | skelly | 2009-07-20 11:41:10 +0200 (Mon, 20 Jul 2009) | 1 line
Use start.column as the column. At least, don't set it to the wrong value.
........
r999618 | skelly | 2009-07-20 11:41:12 +0200 (Mon, 20 Jul 2009) | 1 line
Add a way to clear the Dynamic Tree Model
........
r999619 | skelly | 2009-07-20 11:41:15 +0200 (Mon, 20 Jul 2009) | 4 lines
Move the commands for the tests into a separate class.
This will allow running tests individually, and putting the tests into
the gui test app.
........
r999620 | skelly | 2009-07-20 11:41:17 +0200 (Mon, 20 Jul 2009) | 1 line
Use init method to that tests get set up correctly each time.
........
r999621 | skelly | 2009-07-20 11:41:19 +0200 (Mon, 20 Jul 2009) | 1 line
Stop and start the model spy spying when needed.
........
r999622 | skelly | 2009-07-20 11:41:21 +0200 (Mon, 20 Jul 2009) | 1 line
Add some infrastructure for signalling moves.
........
r999623 | skelly | 2009-07-20 11:41:24 +0200 (Mon, 20 Jul 2009) | 1 line
Some test fixes and asserts.
........
r999624 | skelly | 2009-07-20 11:41:27 +0200 (Mon, 20 Jul 2009) | 1 line
add some skeletal stuff for move testing.
........
r999625 | skelly | 2009-07-20 11:41:32 +0200 (Mon, 20 Jul 2009) | 3 lines
Update for changes in ProxyModelTest.
This will allow testing making different selections.
........
r999627 | ervin | 2009-07-20 11:48:46 +0200 (Mon, 20 Jul 2009) | 2 lines
Allow to remove a collection from the favorites list.
........
r999630 | ervin | 2009-07-20 11:49:37 +0200 (Mon, 20 Jul 2009) | 3 lines
Make use of the new action to remove a collection from the favorites
list.
........
r999658 | skelly | 2009-07-20 12:45:12 +0200 (Mon, 20 Jul 2009) | 5 lines
Try again to move tests for proxy models to kdelibs.
SVN is wierd.
........
r999674 | skelly | 2009-07-20 13:01:30 +0200 (Mon, 20 Jul 2009) | 2 lines
Try again to move proxymodel dox from kdepim to kdelibs.
........
r999758 | ervin | 2009-07-20 15:33:32 +0200 (Mon, 20 Jul 2009) | 2 lines
Allow to change the label of a favorite. Make the labels persistent.
........
r999760 | ervin | 2009-07-20 15:34:19 +0200 (Mon, 20 Jul 2009) | 2 lines
Make use of the rename action for favorite folders.
........
r999765 | jarmond | 2009-07-20 15:40:37 +0200 (Mon, 20 Jul 2009) | 5 lines
Implement %SIGNATURE template command to allow customised signature
insertion location.
FEATURE: 6376
FEATURE: 159789
........
r999879 | scripty | 2009-07-20 16:33:00 +0200 (Mon, 20 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r999883 | bbroeksema | 2009-07-20 16:34:56 +0200 (Mon, 20 Jul 2009) | 7 lines
Replace the combobox widget with a treeview in the settings pages of akonadi
based conduits.
Thanks Robert Marmorstein for providing this patch!
BUG: 181558
........
r1000002 | ervin | 2009-07-20 19:47:58 +0200 (Mon, 20 Jul 2009) | 3 lines
Attach a favorite selection model to the standard action manager of
akonadiconsole.
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1002886
settings.
Also move formatString from kmmessage.cpp to stringutil.cpp
Also create TemplatesConfiguration::configIdString function for
obtaining custom template identifier.
BUG: 182911
svn path=/trunk/KDE/kdepim/; revision=1002105
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1001272 | tmcguire | 2009-07-22 15:31:05 -0400 (Wed, 22 Jul 2009) | 5 lines
Parse the mime tree before collecting attachments.
This fixes the problem that forwarding encryped mails did not work as expected.
kolab/issue3725
MERGE: e4,trunk,4.3
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1001281
Thomas McGuire
Volker Krause
Torgny Nyblom
Allen Winter
Kevin Ottens
Frank Osterfeld
Laurent Montel
Bertjan Broeksema
Leo Franchi
Andras Mantia
Jonathan Armond