SVN_MERGE
Merged revisions 1029580,1029661,1029689,1029710,1029713-1029714,1029760,1029782,1029796,1029798-1029804,1029837,1029864-1029865,1029867,1029885 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1029580 | scripty | 2009-09-30 11:41:51 +0200 (Wed, 30 Sep 2009) | 1 line SVN_SILENT made messages (.desktop file)
................
r1029661 | winterz | 2009-09-30 15:21:02 +0200 (Wed, 30 Sep 2009) | 2 lines fix typo "QString:: null" -> QString()
................
r1029689 | vkrause | 2009-09-30 16:46:20 +0200 (Wed, 30 Sep 2009) | 7 lines Steal Strigi code from the right place (Nepomuk Strigi indexer rather than the obsolete Strigi feeder agent). Now attachment indexing works :) Still highly inefficient and has no error handling, but this should be moved to the feeder agent base class anyway, it's needed for indexing KCal/KABC attachments as well.
................
r1029710 | skelly | 2009-09-30 17:36:49 +0200 (Wed, 30 Sep 2009) | 1 line Disable the fetch more stuff from modeltest.
................
r1029713 | skelly | 2009-09-30 17:37:54 +0200 (Wed, 30 Sep 2009) | 1 line Show hidden collections in akocon.
................
r1029714 | skelly | 2009-09-30 17:37:59 +0200 (Wed, 30 Sep 2009) | 3 lines s/Monitor/ChangeRecorder/g Update for changed EntityTreeModel API.
................
r1029760 | tmcguire | 2009-09-30 19:16:14 +0200 (Wed, 30 Sep 2009) | 300 lines
Block cyclic merges, release stuff, blocks, etc
SVN_SILENT
SVN_MERGE
Blocked revisions 1027252-1027254,1027257-1027258,1027260,1027262-1027263,1027933,1027935,1027999,1028911,1029057-1029059,1029061-1029063,1029339 via svnmerge
................
r1027252 | tmcguire | 2009-09-23 18:58:20 +0200 (Wed, 23 Sep 2009) | 68 lines
Block cyclic merges, scripty, ktimetracker, ...
SVN_SILENT
Blocked revisions 1024449,1024451,1024458,1025325,1026315 via svnmerge
................
r1024449 | scripty | 2009-09-16 18:14:42 +0200 (Wed, 16 Sep 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r1024451 | tmcguire | 2009-09-16 18:15:50 +0200 (Wed, 16 Sep 2009) | 20 lines
Backport r1024429 by tmcguire from trunk to the 4.3 branch:
SVN_MERGE
Merged revisions 1022284 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1022284 | winterz | 2009-09-11 13:19:22 +0200 (Fri, 11 Sep 2009) | 9 lines
Merged revisions 1022235 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1022235 | mutz | 2009-09-11 04:40:28 -0400 (Fri, 11 Sep 2009) | 1 line
Don't leave a signTestNode lying around if we've already written out a deferred decryption block. Fixes regression kolab/issue3577.
........
................
................
r1024458 | tmcguire | 2009-09-16 18:17:02 +0200 (Wed, 16 Sep 2009) | 24 lines
Backport r1024425 by tmcguire from trunk to the 4.3 branch:
SVN_MERGE
Merged revisions 1021557 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1021557 | winterz | 2009-09-09 16:07:16 +0200 (Wed, 09 Sep 2009) | 13 lines
Merged revisions 1021405 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1021405 | mutz | 2009-09-09 02:10:05 -0400 (Wed, 09 Sep 2009) | 5 lines
certmanager/lib/ui/messagebox.cpp: make saved auditlog valid HTML
Before, we were writing out the QtML that we have in the QTextEdit. Now, we
keep a pristine copy of the audit log as received from the backend, and wrap
it in <html><head><title>{caption}</title></head><body>...</body></html>
........
................
................
r1025325 | cgiboudeaux | 2009-09-18 14:06:27 +0200 (Fri, 18 Sep 2009) | 5 lines
Fix an include issue when building kdepim branch vs. kdelibs trunk + 4.3/experimental
MERGE: none
................
r1026315 | tstaerk | 2009-09-21 14:43:04 +0200 (Mon, 21 Sep 2009) | 4 lines
Allow handing over a parameter to work on a specific iCalendar file.
Backport of 1026234.
CCBUGS:194865
................
................
r1027253 | tmcguire | 2009-09-23 19:04:43 +0200 (Wed, 23 Sep 2009) | 9 lines
Merged revisions 1024448 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1024448 | tmcguire | 2009-09-16 18:14:36 +0200 (Wed, 16 Sep 2009) | 1 line
Backport the fixes for the incorrect iterator porting from trunk to the 4.3 branch.
........
................
r1027254 | tmcguire | 2009-09-23 19:07:39 +0200 (Wed, 23 Sep 2009) | 11 lines
Merged revisions 1024907 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1024907 | dfaure | 2009-09-17 16:44:39 +0200 (Thu, 17 Sep 2009) | 4 lines
Add null-check in setTitle too (r990396 was about tabWidthForMaxChars).
Fix will be in 4.3.2.
BUG: 185597
........
................
r1027257 | tmcguire | 2009-09-23 19:11:53 +0200 (Wed, 23 Sep 2009) | 11 lines
Merged revisions 1026391 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1026391 | winterz | 2009-09-21 20:09:27 +0200 (Mon, 21 Sep 2009) | 4 lines
Backport r1023692 by tmcguire from trunk to the 4.3 branch:
Remove unneeded code, this is done in setTimeEditorsEnabled() already, and even correctly (obeying allday setting)
........
................
r1027258 | tmcguire | 2009-09-23 19:15:41 +0200 (Wed, 23 Sep 2009) | 11 lines
Merged revisions 1026392 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1026392 | winterz | 2009-09-21 20:09:54 +0200 (Mon, 21 Sep 2009) | 4 lines
Backport r1023693 by tmcguire from trunk to the 4.3 branch:
Didn't want to remove this in r1023692.
........
................
r1027260 | tmcguire | 2009-09-23 19:18:16 +0200 (Wed, 23 Sep 2009) | 13 lines
Merged revisions 1026393 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1026393 | winterz | 2009-09-21 20:10:23 +0200 (Mon, 21 Sep 2009) | 7 lines
Backport r1023697 by tmcguire from trunk to the 4.3 branch:
Set the correct time zone when setting the defaults.
This and my previous commits have the effect that when creating all day events, the time
zone is correctly shown as "Floating".
........
................
r1027262 | tmcguire | 2009-09-23 19:23:17 +0200 (Wed, 23 Sep 2009) | 16 lines
Merged revisions 1026400 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1026400 | winterz | 2009-09-21 20:26:14 +0200 (Mon, 21 Sep 2009) | 10 lines
Backport r1026321 by winterz from trunk to the 4.3 branch:
use qobject_cast instead of dynamic_cast where possible
check for invalid start/end dates
check for incidence=0
in general, a bunch of little changes for guarding against crashes in Month view.
CCBUG: 197507
MERGE: 4.3
........
................
r1027263 | tmcguire | 2009-09-23 19:24:47 +0200 (Wed, 23 Sep 2009) | 12 lines
Merged revisions 1026401 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r1026401 | winterz | 2009-09-21 20:26:40 +0200 (Mon, 21 Sep 2009) | 6 lines
Backport r1026322 by winterz from trunk to the 4.3 branch:
guard against showing a popup for an invalid date.
MERGE: 4.3
........
................
r1027933 | tmcguire | 2009-09-25 10:24:06 +0200 (Fri, 25 Sep 2009) | 1 line
Update Newslog.txt
................
r1027935 | tmcguire | 2009-09-25 10:25:10 +0200 (Fri, 25 Sep 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
................
r1027999 | winterz | 2009-09-25 14:10:24 +0200 (Fri, 25 Sep 2009) | 16 lines
Blocked revisions 1027930-1027931,1027934 via svnmerge
........
r1027930 | tmcguire | 2009-09-25 04:14:19 -0400 (Fri, 25 Sep 2009) | 1 line
Update Newslog.txt
........
r1027931 | tmcguire | 2009-09-25 04:17:38 -0400 (Fri, 25 Sep 2009) | 1 line
SVN_SILENT fix date
........
r1027934 | tmcguire | 2009-09-25 04:24:51 -0400 (Fri, 25 Sep 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
........
................
r1028911 | winterz | 2009-09-28 15:09:30 +0200 (Mon, 28 Sep 2009) | 8 lines
Blocked revisions 1028909 via svnmerge
........
r1028909 | mutz | 2009-09-28 09:01:52 -0400 (Mon, 28 Sep 2009) | 1 line
Kleo::MessageBox: fix "debug output not ended with \n" warning
........
................
r1029057 | winterz | 2009-09-28 23:24:51 +0200 (Mon, 28 Sep 2009) | 9 lines
Blocked revisions 1024845 via svnmerge
........
r1024845 | winterz | 2009-09-17 07:41:19 -0400 (Thu, 17 Sep 2009) | 3 lines
add Nuno's new icons for anniversary, birthday, and special occassion
MERGE: none
........
................
r1029058 | winterz | 2009-09-28 23:25:48 +0200 (Mon, 28 Sep 2009) | 12 lines
Blocked revisions 1024932 via svnmerge
........
r1024932 | winterz | 2009-09-17 12:35:28 -0400 (Thu, 17 Sep 2009) | 6 lines
rename the new calendar icons so that the buildsystem installs them properly.
apparently each '-' separated string in the name becomes a new subdir
in the installation path.
MERGE: none (the cmake buildsystem doesn't require the renaming)
........
................
r1029059 | winterz | 2009-09-28 23:26:48 +0200 (Mon, 28 Sep 2009) | 8 lines
Blocked revisions 1027123 via svnmerge
........
r1027123 | ludwigreiter | 2009-09-23 06:33:47 -0400 (Wed, 23 Sep 2009) | 2 lines
Removed not-fixed kolab/issue3864 and kolab/issue3863
........
................
r1029061 | winterz | 2009-09-28 23:29:44 +0200 (Mon, 28 Sep 2009) | 13 lines
Recorded merge of revisions 1028964 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1028964 | winterz | 2009-09-28 12:28:44 -0400 (Mon, 28 Sep 2009) | 7 lines
add an active data parameter to the IncidenceFormatter::extensiveDisplayStr() and toolTipStr()
to use in recurring Incidences so correct start/end/due dates can be displayed.
kolab/issue3813
MERGE: e4 (already in trunk)
........
................
r1029062 | winterz | 2009-09-28 23:31:02 +0200 (Mon, 28 Sep 2009) | 14 lines
Blocked revisions 1028968,1028981 via svnmerge
........
r1028968 | winterz | 2009-09-28 12:53:56 -0400 (Mon, 28 Sep 2009) | 2 lines
fix a crash showing monthview item tooltips. part of the kolab/issue3813 fix.
........
r1028981 | winterz | 2009-09-28 13:20:16 -0400 (Mon, 28 Sep 2009) | 4 lines
fix printing the next occurrence in recurring events and to-dos.
basically I had forgotten to remove some old code.
MERGE: none
........
................
r1029063 | winterz | 2009-09-28 23:32:28 +0200 (Mon, 28 Sep 2009) | 12 lines
Recorded merge of revisions 1028978 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1028978 | winterz | 2009-09-28 13:15:44 -0400 (Mon, 28 Sep 2009) | 5 lines
second do'h related to signal signatures today.
fix eventviewer showing a newly selected incidence.
kolab/issue3813
MERGE: e4
........
................
r1029339 | winterz | 2009-09-29 17:13:37 +0200 (Tue, 29 Sep 2009) | 8 lines
Blocked revisions 1029337 via svnmerge
........
r1029337 | winterz | 2009-09-29 11:11:13 -0400 (Tue, 29 Sep 2009) | 2 lines
whoopsie. restore the kpilot plugin build
........
................................
r1029782 | tokoe | 2009-09-30 20:23:17 +0200 (Wed, 30 Sep 2009) | 2 lines link with gold
................
r1029796 | tmcguire | 2009-09-30 20:52:03 +0200 (Wed, 30 Sep 2009) | 17 lines
Merged revisions 1027247 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027247 | winterz | 2009-09-23 18:49:31 +0200 (Wed, 23 Sep 2009) | 10 lines
Merged revisions 1027235 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027235 | winterz | 2009-09-23 12:22:11 -0400 (Wed, 23 Sep 2009) | 3 lines
in setHolidaysMasks(), avoid a crash if the selecteddates QList is empty.
MERGE: e4,trunk,4.3
........
................................
r1029798 | tmcguire | 2009-09-30 20:56:07 +0200 (Wed, 30 Sep 2009) | 19 lines
Merged revisions 1027305 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027305 | winterz | 2009-09-23 21:52:12 +0200 (Wed, 23 Sep 2009) | 12 lines
Merged revisions 1027276 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027276 | tmcguire | 2009-09-23 14:19:38 -0400 (Wed, 23 Sep 2009) | 5 lines
Use the clicked Url here, not the hovered.
Fixes the "New Message To" action not working.
kolab/issue3876
MERGE: e4, trunk
........
................................
r1029799 | tmcguire | 2009-09-30 20:57:45 +0200 (Wed, 30 Sep 2009) | 17 lines
Merged revisions 1027946 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027946 | tmcguire | 2009-09-25 10:36:37 +0200 (Fri, 25 Sep 2009) | 10 lines
Merged revisions 1027157 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027157 | tmcguire | 2009-09-23 14:26:40 +0200 (Wed, 23 Sep 2009) | 3 lines
Always set the identity when answering an invitation, as we need that to figure things
like the transport out.
........
................................
r1029800 | tmcguire | 2009-09-30 20:59:35 +0200 (Wed, 30 Sep 2009) | 21 lines
Merged revisions 1027948 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027948 | tmcguire | 2009-09-25 10:42:35 +0200 (Fri, 25 Sep 2009) | 14 lines
Merged revisions 1027162,1027176 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027162 | tmcguire | 2009-09-23 14:56:38 +0200 (Wed, 23 Sep 2009) | 3 lines
When answering an invitation, make sure the sticky identity/transport is _not_ used, rather use
the identity of the receiver of the invitation.
........
r1027176 | tmcguire | 2009-09-23 15:23:41 +0200 (Wed, 23 Sep 2009) | 1 line
Actually make the previous commit work and don't save the settings in this case.
........
................................
r1029801 | tmcguire | 2009-09-30 21:01:06 +0200 (Wed, 30 Sep 2009) | 17 lines
Merged revisions 1027953 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027953 | tmcguire | 2009-09-25 10:58:45 +0200 (Fri, 25 Sep 2009) | 10 lines
Merged revisions 1027202 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027202 | tmcguire | 2009-09-23 16:40:09 +0200 (Wed, 23 Sep 2009) | 3 lines
If we are not sure about which transport to use, better ask the user.
Fixes kolab/issue3182
........
................................
r1029802 | tmcguire | 2009-09-30 21:02:34 +0200 (Wed, 30 Sep 2009) | 16 lines
Merged revisions 1027954 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027954 | tmcguire | 2009-09-25 11:04:35 +0200 (Fri, 25 Sep 2009) | 9 lines
Merged revisions 1027203 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027203 | tmcguire | 2009-09-23 16:48:29 +0200 (Wed, 23 Sep 2009) | 2 lines
Fix scenario with default identity and make logic more readable
........
................................
r1029803 | tmcguire | 2009-09-30 21:04:03 +0200 (Wed, 30 Sep 2009) | 16 lines
Merged revisions 1027956 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1027956 | tmcguire | 2009-09-25 11:06:43 +0200 (Fri, 25 Sep 2009) | 9 lines
Merged revisions 1027206 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1027206 | tmcguire | 2009-09-23 17:00:30 +0200 (Wed, 23 Sep 2009) | 1 line
Don't ask for a transport if there is only one.
........
................................
r1029804 | tmcguire | 2009-09-30 21:05:12 +0200 (Wed, 30 Sep 2009) | 17 lines
SVN_SILENT
SVN_MERGE
Blocked revisions 1029055 via svnmerge
................
r1029055 | winterz | 2009-09-28 23:23:10 +0200 (Mon, 28 Sep 2009) | 9 lines
Merged revisions 1021206 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1021206 | winterz | 2009-09-08 10:32:04 -0400 (Tue, 08 Sep 2009) | 2 lines
copy over a bunch of fixes we've made over the past few years in trunk.
........
................................
r1029837 | stikonas | 2009-09-30 23:16:05 +0200 (Wed, 30 Sep 2009) | 1 line Grammar: Use singular instead of plural when res.numRecipients()==1
................
r1029864 | pokrzywka | 2009-10-01 00:56:51 +0200 (Thu, 01 Oct 2009) | 1 line nepomuk_email_feeder needs strigi client libs now, so only build it if those are available
................
r1029865 | pokrzywka | 2009-10-01 00:57:53 +0200 (Thu, 01 Oct 2009) | 1 line missing include (could be a forward-declare ?)
................
r1029867 | pokrzywka | 2009-10-01 01:09:09 +0200 (Thu, 01 Oct 2009) | 1 line another missing include
................
r1029885 | cfeck | 2009-10-01 01:56:28 +0200 (Thu, 01 Oct 2009) | 12 lines
Fix layout
Also changed some strings:
Event > event
to-do > To-do (one occurence)
KAddressBook -> address book
I noticed that these UI files seem to contain duplicate widgets.
Is there a way to merge the code for handling them?
CCMAIL: winter@kde.org................
svn path=/branches/work/akonadi-ports/kdepim/; revision=1029945