Tag: Branch: Tree: 926550fc54

wilder

wilder-work

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '926550fc54'

${ noResults }

Commit Graph

76 Commits (926550fc5496924321f47a3bc442e23b68a47485)

Author	SHA1	Message	Date
Allen Winter	58cbfe5e25	Merged revisions 1039801 via svnmerge from ... https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1039801 | winterz | 2009-10-24 12:42:02 -0400 (Sat, 24 Oct 2009) | 4 lines don't check for forgotten attachments in invitation email MERGE: e4 (already in trunk) ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1039804	17 years ago
Allen Winter	d633c07312	don't check for forgotten attachments in invitation email ... MERGE: e4 (already in trunk) svn path=/branches/kdepim/enterprise/kdepim/; revision=1039801	17 years ago
Volker Krause	d76e800394	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	17 years ago
Thomas McGuire	e60c2db76e	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. ........ ................ svn path=/trunk/KDE/kdepim/; revision=1029803	17 years ago
Thomas McGuire	c0fd50fb91	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 ........ ................ svn path=/trunk/KDE/kdepim/; revision=1029802	17 years ago
Thomas McGuire	997394fcc2	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 ........ ................ svn path=/trunk/KDE/kdepim/; revision=1029801	17 years ago
Thomas McGuire	50df509ffd	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. ........ ................ svn path=/trunk/KDE/kdepim/; revision=1029800	17 years ago
Thomas McGuire	6640fb952b	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. ........ ................ svn path=/trunk/KDE/kdepim/; revision=1029799	17 years ago
Thomas McGuire	3a39db207b	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. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1027956	17 years ago
Thomas McGuire	40e51aa256	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 ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1027954	17 years ago
Thomas McGuire	e632be03d5	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 ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1027953	17 years ago
Thomas McGuire	f3e7b40502	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. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1027948	17 years ago
Thomas McGuire	9c0b0fa49c	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. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=1027946	17 years ago
Thomas McGuire	570e5dc151	Don't ask for a transport if there is only one. ... svn path=/branches/kdepim/enterprise/kdepim/; revision=1027206	17 years ago
Thomas McGuire	4c99436296	Fix scenario with default identity and make logic more readable ... svn path=/branches/kdepim/enterprise/kdepim/; revision=1027203	17 years ago
Thomas McGuire	d5f2004ac3	If we are not sure about which transport to use, better ask the user. ... Fixes kolab/issue3182 svn path=/branches/kdepim/enterprise/kdepim/; revision=1027202	17 years ago
Thomas McGuire	a12d254fdd	Actually make the previous commit work and don't save the settings in this case. ... svn path=/branches/kdepim/enterprise/kdepim/; revision=1027176	17 years ago
Thomas McGuire	185184d36b	When answering an invitation, make sure the sticky identity/transport is _not_ used, rather use ... the identity of the receiver of the invitation. svn path=/branches/kdepim/enterprise/kdepim/; revision=1027162	17 years ago
Thomas McGuire	22be57de7d	Always set the identity when answering an invitation, as we need that to figure things ... like the transport out. svn path=/branches/kdepim/enterprise/kdepim/; revision=1027157	17 years ago
Thomas McGuire	75264660b9	SVN_SILENT minor whitespace changes in kdebug() calls, where the original conversion screwed up. ... svn path=/trunk/KDE/kdepim/; revision=1002193	17 years ago
Allen Winter	a8a92eb882	Merged revisions 998346 via svnmerge from ... https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r998346 | winterz | 2009-07-17 09:51:41 -0400 (Fri, 17 Jul 2009) | 5 lines backport SVN commit 998252 by amantia: Another solution for don't show "too many recipients" warning for invitation mails (thanks to Thomas). Fixes kolab/issue3718. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=998369	17 years ago
Allen Winter	1d04d3e62d	backport SVN commit 998252 by amantia: ... Another solution for don't show "too many recipients" warning for invitation mails (thanks to Thomas). Fixes kolab/issue3718. svn path=/branches/kdepim/enterprise/kdepim/; revision=998346	17 years ago
Andras Mantia	1b30422567	Backport r998252. ...	17 years ago
Andras Mantia	a10d3c8096	Another solution for don't show "too many recipients" warning for invitation mails (thanks to Thomas). Fixes kolab/issue3718. ... MERGE: e35 svn path=/trunk/KDE/kdepim/; revision=998252	17 years ago
Thomas McGuire	4828ec9940	Merged revisions 978901 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r978901 | winterz | 2009-06-08 15:38:08 +0200 (Mon, 08 Jun 2009) | 18 lines Merged revisions 974512 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r974512 | winterz | 2009-05-29 10:44:43 -0400 (Fri, 29 May 2009) | 12 lines Create a new Groupware Compatibility configuration option for sending invitation reply comments in a a way that Outlook understands. This option is currently false by default. I still need to document this option in the kmail handbook and in the kontact-admin handbook. part of the kolab/issue3424 fix. MERGE: e4, 4.4 ........ ................ svn path=/trunk/KDE/kdepim/; revision=986469	17 years ago
Frank Thieme	e662913d5f	renamed KMDeleteMsgCommand to more reasonable KMTrashMsgCommand ... svn path=/trunk/KDE/kdepim/; revision=983994	17 years ago
Allen Winter	cd84d2f377	Merged revisions 974512 via svnmerge from ... https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r974512 | winterz | 2009-05-29 10:44:43 -0400 (Fri, 29 May 2009) | 12 lines Create a new Groupware Compatibility configuration option for sending invitation reply comments in a a way that Outlook understands. This option is currently false by default. I still need to document this option in the kmail handbook and in the kontact-admin handbook. part of the kolab/issue3424 fix. MERGE: e4, 4.4 ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=978901	17 years ago
Allen Winter	2ce2fabe9b	Create a new Groupware Compatibility configuration option for sending ... invitation reply comments in a a way that Outlook understands. This option is currently false by default. I still need to document this option in the kmail handbook and in the kontact-admin handbook. part of the kolab/issue3424 fix. MERGE: e4, 4.4 svn path=/branches/kdepim/enterprise/kdepim/; revision=974512	17 years ago
Thomas McGuire	a5976f69b0	Merged revisions 968658 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r968658 | tmcguire | 2009-05-16 16:18:13 +0200 (Sat, 16 May 2009) | 3 lines Better not allow HTML here as well, even though I think that should be ok as per RFC, as this sends the iCal in an attachment anyway. ........ svn path=/trunk/KDE/kdepim/; revision=970626	17 years ago
Thomas McGuire	762277d307	Better not allow HTML here as well, even though I think that should be ok as per RFC, ... as this sends the iCal in an attachment anyway. svn path=/branches/kdepim/enterprise4/kdepim/; revision=968658	17 years ago
Thomas McGuire	5a75ba0d6d	Backport r967434 by tmcguire from trunk to the 4.2 branch: ... Merged revisions 966693 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r966693 | winterz | 2009-05-11 20:33:39 +0200 (Mon, 11 May 2009) | 17 lines Merged revisions 966689 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r966689 | winterz | 2009-05-11 14:26:04 -0400 (Mon, 11 May 2009) | 10 lines Invitation decline comments are now sent as DESCRIPTION property only when the user has selected the "exchange compatible naming" groupware option. Otherwise, we adhere to standards and use the COMMENT property. This should fix kolab/issue3424 more to my satisfaction. Also makes r965355 acceptable and that should also be merged forward, but before this revision. MERGE: e4,trunk,4.2 ........ ................ svn path=/branches/KDE/4.2/kdepim/; revision=967497	17 years ago
Thomas McGuire	3cf5052a81	Merged revisions 966693 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r966693 | winterz | 2009-05-11 20:33:39 +0200 (Mon, 11 May 2009) | 17 lines Merged revisions 966689 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r966689 | winterz | 2009-05-11 14:26:04 -0400 (Mon, 11 May 2009) | 10 lines Invitation decline comments are now sent as DESCRIPTION property only when the user has selected the "exchange compatible naming" groupware option. Otherwise, we adhere to standards and use the COMMENT property. This should fix kolab/issue3424 more to my satisfaction. Also makes r965355 acceptable and that should also be merged forward, but before this revision. MERGE: e4,trunk,4.2 ........ ................ svn path=/trunk/KDE/kdepim/; revision=967434	17 years ago
Allen Winter	e565f34547	Merged revisions 966689 via svnmerge from ... https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r966689 | winterz | 2009-05-11 14:26:04 -0400 (Mon, 11 May 2009) | 10 lines Invitation decline comments are now sent as DESCRIPTION property only when the user has selected the "exchange compatible naming" groupware option. Otherwise, we adhere to standards and use the COMMENT property. This should fix kolab/issue3424 more to my satisfaction. Also makes r965355 acceptable and that should also be merged forward, but before this revision. MERGE: e4,trunk,4.2 ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=966693	17 years ago
Allen Winter	d5f3068582	Invitation decline comments are now sent as DESCRIPTION property only ... when the user has selected the "exchange compatible naming" groupware option. Otherwise, we adhere to standards and use the COMMENT property. This should fix kolab/issue3424 more to my satisfaction. Also makes r965355 acceptable and that should also be merged forward, but before this revision. MERGE: e4,trunk,4.2 svn path=/branches/kdepim/enterprise/kdepim/; revision=966689	17 years ago
Allen Winter	80909a85fa	Cleanup kDebug/kWarning/kError(): ... + No longer pass the debug area + Don't hard code the method name + Remove endls svn path=/trunk/KDE/kdepim/; revision=966226	17 years ago
Laurent Montel	4d3b8dfcb6	Const'ify ... svn path=/trunk/KDE/kdepim/; revision=956426	17 years ago
Thomas McGuire	7c63adbaf1	Backport r870374 by tmcguire from trunk to the 4.1 branch: ... Merged revisions 866739 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r866739 | tilladam | 2008-10-01 21:40:47 +0200 (Wed, 01 Oct 2008) | 1 line On Windows, the serial number gets somehow crrupted, while traversing the plugin boundary. Move the invitation message deletion into the callback, inside KMail, where it belongs. Fixes kolab/issue2705. ........ svn path=/branches/KDE/4.1/kdepim/; revision=870425	18 years ago
Thomas McGuire	f09e7741de	Merged revisions 866739 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r866739 | tilladam | 2008-10-01 21:40:47 +0200 (Wed, 01 Oct 2008) | 1 line On Windows, the serial number gets somehow crrupted, while traversing the plugin boundary. Move the invitation message deletion into the callback, inside KMail, where it belongs. Fixes kolab/issue2705. ........ svn path=/trunk/KDE/kdepim/; revision=870374	18 years ago
Thomas McGuire	05fc52bf3e	Merged revisions 866383 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r866383 | vkrause | 2008-09-30 20:48:29 +0200 (Tue, 30 Sep 2008) | 11 lines Merged revisions 866381 via svnmerge from https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r866381 | vkrause | 2008-09-30 20:34:05 +0200 (Tue, 30 Sep 2008) | 4 lines Pre-select the default identity. Kolab issue 1570 ........ ................ svn path=/trunk/KDE/kdepim/; revision=870370	18 years ago
Till Adam	177ec170d4	On Windows, the serial number gets somehow crrupted, while traversing the plugin boundary. Move the invitation message deletion into the callback, inside KMail, where it belongs. Fixes kolab/issue2705. ... svn path=/branches/kdepim/enterprise4/kdepim/; revision=866739	18 years ago
Bertjan Broeksema	e597473890	EBN Fixes: validity of i18n calls. ... svn path=/trunk/KDE/kdepim/; revision=866449	18 years ago
Volker Krause	2cb8f0c056	Merged revisions 866381 via svnmerge from ... https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r866381 | vkrause | 2008-09-30 20:34:05 +0200 (Tue, 30 Sep 2008) | 4 lines Pre-select the default identity. Kolab issue 1570 ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=866383	18 years ago
Volker Krause	e0658a7ed5	Pre-select the default identity. ... Kolab issue 1570 svn path=/branches/kdepim/enterprise/kdepim/; revision=866381	18 years ago
Thomas McGuire	d500701622	Merged revisions 853314,855273 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim ........ r853314 | tmcguire | 2008-08-27 16:27:44 +0200 (Wed, 27 Aug 2008) | 8 lines Backport r853307 by tmcguire from trunk to the 4.1 branch: - Load the value for "exchange compatible initation naming" into the checkbox - Get rid of some manual config writing/reading CCBUG: 169921 ........ r855273 | tmcguire | 2008-08-31 13:50:59 +0200 (Sun, 31 Aug 2008) | 2 lines Uups, disabled this by accident in r853314. ........ svn path=/branches/kdepim/enterprise4/kdepim/; revision=855290	18 years ago
Thomas McGuire	f9390caa87	Backport r853307 by tmcguire from trunk to the 4.1 branch: ... - Load the value for "exchange compatible initation naming" into the checkbox - Get rid of some manual config writing/reading CCBUG: 169921 svn path=/branches/KDE/4.1/kdepim/; revision=853314	18 years ago
Thomas McGuire	91dff3f778	- Load the value for "exchange compatible initation naming" into the checkbox ... - Get rid of some manual config writing/reading BUG: 169921 svn path=/trunk/KDE/kdepim/; revision=853307	18 years ago
Volker Krause	8694d8aa01	Merged revisions 807761-809626,809628-809708,809710-810236,810238-810302,810304,810306-811064,811066-811205,811207-813546,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072-817087,817089-817101,817103-817567,817569-817603,817605-817709,817711-818287,818289-818311,818313-819076,819078-820073,820075-821035,821037-821124,821126-821345,821347-821370,821372-821378,821380-821648,821650,821652-821835,821837-822268,822270-823852,823854-823882,823884-824217,824219-824277,824279-824285,824287-825075,825077-825083,825085-825805,825807-826354,826356-827490,827492-827612,827614-827891,827893-827903,827905-827944,827946-827949,827951-828972,828974-829033,829035-830099,830101-830132,830134-830442,830444-830477,830479-830875,830877-830932,830934-834241 via svnmerge from ... https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r807761 | vkrause | 2008-05-14 19:00:30 +0200 (Wed, 14 May 2008) | 5 lines Don't delete folder configs for folders that might not be in the list here but nevertheless still exist. Kolab issue 2667 ........ r821814 | vkrause | 2008-06-18 17:21:15 +0200 (Wed, 18 Jun 2008) | 5 lines Make sure favorite folder items get the same label independent of how say are created. Kolab issue 2785. ........ r823865 | tilladam | 2008-06-24 14:03:18 +0200 (Tue, 24 Jun 2008) | 7 lines Make it possible again to accept an invitation that was sent to a distribution list the current user is part of, by offering all the identities in addition to the recipients of the invite as choices for the attendee. kolab/issue1998 ........ r824289 | vkrause | 2008-06-25 17:20:44 +0200 (Wed, 25 Jun 2008) | 3 lines Honor local subscription, fixes non-subscribed folders showing up in the folder tree for a short time after changing local subscriptions. ........ r824806 | vkrause | 2008-06-26 18:42:06 +0200 (Thu, 26 Jun 2008) | 6 lines The else block is supposed to belong to the outer if, so we need braces here. This ensures that a failed annotation job is removed correctly from the job map and therefore avoids a crash on exit when KMail tries to cancel the apparently still running job. ........ r830550 | vkrause | 2008-07-10 20:51:09 +0200 (Thu, 10 Jul 2008) | 23 lines Backport SVN commit 829126 by vkrause from enterprise4 branch: Close the folder before we unregister from the message dict. This fixes the .index.db file being newer than the corresponding .index.ids file, causing the latter being detected as outdated on the next startup. In this case message wouldn't have a serial number, which the sqlite backend poorly recovers from, causing apparent mail loss (fixable by rebuilding the folder index). And to make it even more confusing, this only happends for new DIMAP folders that have been synced but not entered yet before shutting down KMail. Kolab issue 2816 Incidentally this also fixes the mysterious non-persistence of certain folder infos worked around in revision 830478. This happend because groupware folders were kept open until destructions. However, writeConfig() was called from the KMFolderMaildir dtor at which point the virtual writeConfig() in KMFolderCachedImap wasn't available anymore. Kolab issue 2666 ........ r834241 | vkrause | 2008-07-18 15:25:03 +0200 (Fri, 18 Jul 2008) | 7 lines Update the highest uid even if we don't find the corresponding message anymore or the folder is empty. This happens for example when the message with this uid was moved away by a filter just before we got here, which then caused mail duplication during the next sync. Kolab issue 2801 ........ svn path=/branches/KDE/3.5/kdepim/; revision=848898	18 years ago
Volker Krause	698163323e	First round of counter proposal fixes with minor changes to comply with the string freeze. All added strings should already be present elsewhere in the same module. ... Merged revisions 791184-791440,791443-792201,792203-792957 via svnmerge from https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r791184 | vkrause | 2008-03-28 17:52:23 +0100 (Fri, 28 Mar 2008) | 4 lines Add the proposed new event into the calendar. Kolab issue 2148 ........ r791200 | vkrause | 2008-03-28 19:02:57 +0100 (Fri, 28 Mar 2008) | 2 lines Improve display of iTIP counter proposals. ........ r791414 | vkrause | 2008-03-29 15:00:41 +0100 (Sat, 29 Mar 2008) | 2 lines Implement declining of counter proposals. ........ r791430 | vkrause | 2008-03-29 15:43:58 +0100 (Sat, 29 Mar 2008) | 6 lines - allow to accept counter proposals - send real iTIP counter proposals by default but keep the Outlook compat ones as an option Kolab issue 2147, 2149 ........ r792230 | vkrause | 2008-03-31 19:35:35 +0200 (Mon, 31 Mar 2008) | 4 lines Send declined counter proposals back to the sender instead of to myself. Kolab issue 2581 ........ r792231 | vkrause | 2008-03-31 19:39:22 +0200 (Mon, 31 Mar 2008) | 5 lines Don't delete invitations after a counter proposal in any case, eg. after a rejection it might be needed again. Kolab issue 2580 ........ r792950 | vkrause | 2008-04-02 18:39:22 +0200 (Wed, 02 Apr 2008) | 7 lines - don't add the original event to the calendar when creating a counter proposal - hide the invitation bar when editing a counter proposal to avoid confusion Kolab issue 2582 ........ r792957 | vkrause | 2008-04-02 19:06:52 +0200 (Wed, 02 Apr 2008) | 7 lines don't send cancel notifications to the organizer on event deletion if I happen to be the organizer myself - create standard conform cancel notifications on event deletion (they must contain exactly one attendee entry) Kolab issue 2578 ........ svn path=/branches/KDE/3.5/kdepim/; revision=848887	18 years ago
Thomas McGuire	e692e5d444	Merged revisions 823872 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r823872 | tilladam | 2008-06-24 14:22:34 +0200 (Tue, 24 Jun 2008) | 12 lines Forward port of: SVN commit 823865 by tilladam: Make it possible again to accept an invitation that was sent to a distribution list the current user is part of, by offering all the identities in addition to the recipients of the invite as choices for the attendee. kolab/issue1998 ........ svn path=/trunk/KDE/kdepim/; revision=833879	18 years ago
Thomas McGuire	5a52548555	Merged revisions 819152 via svnmerge from ... svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r819152 | vkrause | 2008-06-10 20:04:17 +0200 (Tue, 10 Jun 2008) | 17 lines Merged revisions 792202-792230 via svnmerge from https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r792202 | vkrause | 2008-03-31 18:33:11 +0200 (Mon, 31 Mar 2008) | 4 lines Show recurrence in invitations. Kolab issue 2577 ........ r792230 | vkrause | 2008-03-31 19:35:35 +0200 (Mon, 31 Mar 2008) | 4 lines Send declined counter proposals back to the sender instead of to myself. Kolab issue 2581 ........ ................ svn path=/trunk/KDE/kdepim/; revision=833856	18 years ago