-
Volker Krause authoredMerged revisions 1033026,1033055,1033061,1033064,1033104,1033146,1033210-1033211,1033217,1033236,1033241 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ................ r1033026 | scripty | 2009-10-09 11:29:51 +0200 (Fri, 09 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1033055 | winterz | 2009-10-09 13:57:01 +0200 (Fri, 09 Oct 2009) | 2 lines fix ................ r1033061 | winterz | 2009-10-09 14:13:56 +0200 (Fri, 09 Oct 2009) | 2 lines include <unistd.h> for link() ................ r1033064 | winterz | 2009-10-09 14:17:01 +0200 (Fri, 09 Oct 2009) | 2 lines fix compiler warning about nested comments ................ r1033104 | skelly | 2009-10-09 15:39:39 +0200 (Fri, 09 Oct 2009) | 1 line Fix build with NO_CAST_FROM_ASCII ................ r1033146 | jtamate | 2009-10-09 17:45:49 +0200 (Fri, 09 Oct 2009) | 3 lines Fix for a regression I introduced with http://reviewboard.kde.org/r/1293 In the new and old location of the code. ................ r1033210 | tmcguire | 2009-10-09 19:59:43 +0200 (Fri, 09 Oct 2009) | 1 line Signals can not be virtual, says moc ................ r1033211 | djarvie | 2009-10-09 20:05:26 +0200 (Fri, 09 Oct 2009) | 3 lines Update date-only alarm trigger times when user changes the start-of-day time. Don't write start-of-day time into calendar, to avoid clashes if it is shared. ................ r1033217 | djarvie | 2009-10-09 20:16:21 +0200 (Fri, 09 Oct 2009) | 2 lines Don't write start-of-day time into calendar, to avoid clashes if it is shared. ................ r1033236 | aalvarez | 2009-10-09 21:27:21 +0200 (Fri, 09 Oct 2009) | 4 lines - Fixed bug that made the resource crash when a profile database didn't exist. - Default profile language creation to en-US language - Made resource compile with openchange trunk ................ r1033241 | tmcguire | 2009-10-09 21:37:08 +0200 (Fri, 09 Oct 2009) | 373 lines Block all those block-worthy commits SVN_SILENT SVN_MERGE Blocked revisions 1029791,1029793,1029806-1029808,1030084,1030233,1030459-1030460,1031968,1031989,1031997,1032001,1032007,1032015,1032021,1032112,1032114,1032285,1032851,1032853,1032866 via svnmerge ................ r1029791 | tmcguire | 2009-09-30 20:47:42 +0200 (Wed, 30 Sep 2009) | 3 lines Repair broken svnmerge properties, step one: Re-Block 1024449,1024451,1024458,1025325,1026315 ................ r1029793 | tmcguire | 2009-09-30 20:50:02 +0200 (Wed, 30 Sep 2009) | 4 lines Repair broken svnmerge properties, step 2: Mark as merged: 1024448,1024907,1026391-1026393,1026400-1026401 ................ r1029806 | tmcguire | 2009-09-30 21:17:00 +0200 (Wed, 30 Sep 2009) | 141 lines Block cyclic merges, releaese stuff, akonadi, scripty, kalarm, ... SVN_SILENT Blocked revisions 1027231,1027233,1027236-1027237,1027350,1027454,1028614,1028862,1028929,1029329,1029535 via svnmerge ................ r1027231 | tmcguire | 2009-09-23 18:16:15 +0200 (Wed, 23 Sep 2009) | 24 lines Backport r1024426 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1021558 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1021558 | winterz | 2009-09-09 16:14:02 +0200 (Wed, 09 Sep 2009) | 13 lines Merged revisions 1021421 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1021421 | mutz | 2009-09-09 02:38:07 -0400 (Wed, 09 Sep 2009) | 5 lines QGpgMEJob: fix reads past-the-end in get_auditlog_as_html In Qt3, QByteArrays are not '\0'-delimited, so we need to pass the QByteArray size explicitly into QString::fromUtf8(). This removes the garbage at the end of the audit log. ........ ................ ................ r1027233 | tmcguire | 2009-09-23 18:21:33 +0200 (Wed, 23 Sep 2009) | 30 lines Backport r1027225 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1024389 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1024389 | winterz | 2009-09-16 16:06:47 +0200 (Wed, 16 Sep 2009) | 19 lines Merged revisions 1024159 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1024159 | tmcguire | 2009-09-16 04:44:29 -0400 (Wed, 16 Sep 2009) | 12 lines When renaming a folder, make sure the reference count is correct again, i.e. open the folder in the syncing code, as that closes the folder later. THis fixes some issues with the message list, as the folder got closed behind its back. Don't clear the selected message after renaming a folder as well. Also, remove some annoying debug output when syncing. Fixes kolab/issue3853 ........ ................ ................ r1027236 | tmcguire | 2009-09-23 18:22:15 +0200 (Wed, 23 Sep 2009) | 22 lines Backport r1027226 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1024393 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1024393 | winterz | 2009-09-16 16:13:29 +0200 (Wed, 16 Sep 2009) | 11 lines Merged revisions 1024288 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1024288 | tmcguire | 2009-09-16 06:29:52 -0400 (Wed, 16 Sep 2009) | 4 lines Don't overwrite custom folder types. Treat the folder as a mail folder instead. kolab/issue2069 ........ ................ ................ r1027237 | tmcguire | 2009-09-23 18:23:05 +0200 (Wed, 23 Sep 2009) | 21 lines Backport r1027228 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1025188 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1025188 | tmcguire | 2009-09-18 10:48:53 +0200 (Fri, 18 Sep 2009) | 10 lines Merged revisions 1025159 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1025159 | tmcguire | 2009-09-18 10:22:08 +0200 (Fri, 18 Sep 2009) | 3 lines Fix regression that the shared seen flag was not saved for the inbox. kolab/issue3830 ........ ................ ................ r1027350 | winterz | 2009-09-23 23:29:43 +0200 (Wed, 23 Sep 2009) | 2 lines increase the patch level for next week's 4.3.2 tagging. ................ r1027454 | skelly | 2009-09-24 10:37:49 +0200 (Thu, 24 Sep 2009) | 3 lines Fix tests in a gui-less environment ................ r1028614 | winterz | 2009-09-27 20:25:51 +0200 (Sun, 27 Sep 2009) | 4 lines backport SVN commit 1028613 by winterz: don't show events that are already over. such events cannot be considered "upcoming". ................ r1028862 | winterz | 2009-09-28 13:13:36 +0200 (Mon, 28 Sep 2009) | 7 lines revert SVN commit 1028613 by winterz: don't show events that are already over. such events cannot be considered "upcoming". Sorry, I forgot we are in a mini-freeze. Put this back after the mini-freeze is over for 4.3.3. ................ r1028929 | djarvie | 2009-09-28 16:12:22 +0200 (Mon, 28 Sep 2009) | 2 lines Bug 208521: Provide 'any time' option when deferring date-only alarms ................ r1029329 | reed | 2009-09-29 16:51:38 +0200 (Tue, 29 Sep 2009) | 1 line backport r1017719 from trunk (fix kalarm moc generation on !X11) ................ r1029535 | scripty | 2009-09-30 05:08:36 +0200 (Wed, 30 Sep 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ ................ r1029807 | tmcguire | 2009-09-30 21:20:44 +0200 (Wed, 30 Sep 2009) | 12 lines Merged revisions 1027230 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1027230 | tmcguire | 2009-09-23 18:14:58 +0200 (Wed, 23 Sep 2009) | 6 lines Backport r1026498 by tmcguire from trunk to the 4.3 branch: Use BroadcastStatus to set the status message, this fixes the problem of an oversized progress bar in the status bar when fetching feeds in Kontact. ........ ................ r1029808 | tmcguire | 2009-09-30 21:26:27 +0200 (Wed, 30 Sep 2009) | 12 lines Merged revisions 1027308 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1027308 | winterz | 2009-09-23 22:04:18 +0200 (Wed, 23 Sep 2009) | 6 lines Backport r1027261 by tmcguire from trunk to the 4.3 branch: Better also set the start and end time spec for floating events. MERGE: 4.3, e4 ........ ................ r1030084 | winterz | 2009-10-01 16:29:47 +0200 (Thu, 01 Oct 2009) | 10 lines Blocked revisions 1030081 via svnmerge ........ r1030081 | winterz | 2009-10-01 10:19:19 -0400 (Thu, 01 Oct 2009) | 4 lines use the KOMonthView calendar for the cell tooltip should fix a crash reported in kolab/issue3889 MERGE: e4,trunk ........ ................ r1030233 | winterz | 2009-10-02 01:29:36 +0200 (Fri, 02 Oct 2009) | 8 lines Blocked revisions 1030014 via svnmerge ........ r1030014 | ludwigreiter | 2009-10-01 07:50:32 -0400 (Thu, 01 Oct 2009) | 2 lines Correct issue number typo ........ ................ r1030459 | tmcguire | 2009-10-02 12:41:13 +0200 (Fri, 02 Oct 2009) | 1 line Update Newslog.txt ................ r1030460 | tmcguire | 2009-10-02 12:42:19 +0200 (Fri, 02 Oct 2009) | 1 line SVN_SILENT Update version numbers for today's release. ................ r1031968 | winterz | 2009-10-06 16:56:16 +0200 (Tue, 06 Oct 2009) | 10 lines Blocked revisions 1031966 via svnmerge ........ r1031966 | winterz | 2009-10-06 10:53:51 -0400 (Tue, 06 Oct 2009) | 4 lines fix crashes when printing single day events kolab/issue3899 MERGE: none ........ ................ r1031989 | winterz | 2009-10-06 17:51:34 +0200 (Tue, 06 Oct 2009) | 12 lines Blocked revisions 1031988 via svnmerge ........ r1031988 | winterz | 2009-10-06 11:46:22 -0400 (Tue, 06 Oct 2009) | 7 lines backport r933949 | smartins | 2009-03-01 19:12:11 -0500 (Sun, 01 Mar 2009) Support for alarms relative to to-do's dtStart(). this is part of the fix for supporting reminder for to-do starttimes. MERGE: none (already in e4) ........ ................ r1031997 | winterz | 2009-10-06 18:05:42 +0200 (Tue, 06 Oct 2009) | 11 lines Blocked revisions 1031994 via svnmerge ........ r1031994 | winterz | 2009-10-06 12:04:09 -0400 (Tue, 06 Oct 2009) | 5 lines backport SVN commit 917206 by smartins: When an incidence is deleted don't forget to notify registered observers. MERGE: none (already in e4) ........ ................ r1032001 | winterz | 2009-10-06 18:15:57 +0200 (Tue, 06 Oct 2009) | 13 lines Blocked revisions 1032000 via svnmerge ........ r1032000 | winterz | 2009-10-06 12:14:50 -0400 (Tue, 06 Oct 2009) | 7 lines backport SVN commit 925738 by smartins: Emit calendarLoaded() in CalendarResources:load() like specified in KCal:Calendar's API docs. Fixes kontact needing a refresh to show the incidences at startup. MERGE: none (already in e4) ........ ................ r1032007 | winterz | 2009-10-06 18:29:33 +0200 (Tue, 06 Oct 2009) | 11 lines Blocked revisions 1032006 via svnmerge ........ r1032006 | winterz | 2009-10-06 12:28:43 -0400 (Tue, 06 Oct 2009) | 5 lines backport SVN commit 926668 by smartins: Make CalendarResources::endChange() save when incidences are deleted. MERGE: none (already in e4) ........ ................ r1032015 | winterz | 2009-10-06 18:38:20 +0200 (Tue, 06 Oct 2009) | 13 lines Blocked revisions 1032012 via svnmerge ........ r1032012 | winterz | 2009-10-06 12:37:29 -0400 (Tue, 06 Oct 2009) | 7 lines backport SVN commit 932890 by smartins: endDateTime is invalid if the recurrence doesn't have an end. Thanks to Pete for his patch. MERGE: none (already in e4) ........ ................ r1032021 | winterz | 2009-10-06 18:52:07 +0200 (Tue, 06 Oct 2009) | 11 lines Blocked revisions 1032020 via svnmerge ........ r1032020 | winterz | 2009-10-06 12:50:56 -0400 (Tue, 06 Oct 2009) | 5 lines backport SVN commit 938673 by smartins: After deleting, doSave was recreating the file again, so incidences never were deleted. MERGE: none (already in e4) ........ ................ r1032112 | winterz | 2009-10-06 23:38:19 +0200 (Tue, 06 Oct 2009) | 4 lines merge SVN commit 1029395 by winterz from trunk to e4: use birthday and anniversary icons ................ r1032114 | winterz | 2009-10-06 23:40:40 +0200 (Tue, 06 Oct 2009) | 13 lines Recorded merge of revisions 1032041 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1032041 | winterz | 2009-10-06 13:47:28 -0400 (Tue, 06 Oct 2009) | 6 lines backport SVN commit 1029395 by winterz: use birthday and anniversary icons MERGE: e4 (already in trunk) ........ ................ r1032285 | winterz | 2009-10-07 15:34:46 +0200 (Wed, 07 Oct 2009) | 12 lines Recorded merge of revisions 1032282 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1032282 | winterz | 2009-10-07 09:30:32 -0400 (Wed, 07 Oct 2009) | 5 lines backport SVN commit 1030953 by winterz from trunk: add a new static method for determining if a calendar is using Groupware. MERGE: e4 (already in trunk) ........ ................ r1032851 | winterz | 2009-10-08 20:04:24 +0200 (Thu, 08 Oct 2009) | 3 lines copy lots of goodies from trunk for the Upcoming Events summary. also fixes the data corruption bug. ................ r1032853 | winterz | 2009-10-08 20:05:55 +0200 (Thu, 08 Oct 2009) | 13 lines Blocked revisions 1032848 via svnmerge ........ r1032848 | winterz | 2009-10-08 13:52:18 -0400 (Thu, 08 Oct 2009) | 8 lines Fix crash when moving between the Upcoming Events summary and the calendar part. This is a small part of a backport from r1029390 from trunk -- the remaining parts of that commit don't make sense in e35. Fixes urgent kolab/issue3065 MERGE: e4 (not needed in trunk) ........ ................ r1032866 | winterz | 2009-10-08 21:24:43 +0200 (Thu, 08 Oct 2009) | 2 lines fix compile. forgot that not CamelCase headers aren't used yet in e4. ................ ................ svn path=/branches/work/akonadi-ports/kdepim/; revision=1034292
2d8bedf3