SVN_MERGE
Merged revisions 1013196,1013203,1013213,1013287,1013371-1013375,1013378 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs
................
r1013196 | skelly | 2009-08-19 11:19:55 +0200 (Wed, 19 Aug 2009) | 1 line Add some default parameters to set* methods.
................
r1013203 | skelly | 2009-08-19 11:45:27 +0200 (Wed, 19 Aug 2009) | 1 line Revert changes to set method default values, and change new method name.
................
r1013213 | vkrause | 2009-08-19 12:00:31 +0200 (Wed, 19 Aug 2009) | 4 lines Part 4 of fixing the missing RID races: Drop tasks from the scheduler that are no longer relevant as the corresponding collection has been deleted.
................
r1013287 | vkrause | 2009-08-19 14:52:42 +0200 (Wed, 19 Aug 2009) | 7 lines Always schedule change replays before pulling changes from the backend, otherwise we will overwrite unsaved local changes if the backend doesn't support incremental retrieval. This is the 5th and hopefully final part of the series of fixes for the missing RID races.
................
r1013371 | tmcguire | 2009-08-19 20:50:53 +0200 (Wed, 19 Aug 2009) | 67 lines Block cyclic merges. SVN_MERGE SVN_SILENT Blocked revisions 1010908-1010909,1010914-1010915 via svnmerge ................ r1010908 | tmcguire | 2009-08-13 17:33:26 +0200 (Thu, 13 Aug 2009) | 14 lines Merged revisions 1007460 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs ........ r1007460 | tmcguire | 2009-08-05 21:31:23 +0200 (Wed, 05 Aug 2009) | 8 lines Backport r1005872 by mkoller from trunk to the 4.3 branch: CCBUG: 201900 Allow ( ) inside URLs. Also add a unit test. ........ ................ r1010909 | tmcguire | 2009-08-13 17:37:52 +0200 (Thu, 13 Aug 2009) | 13 lines Merged revisions 1008037 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs ........ r1008037 | mkoller | 2009-08-06 20:34:00 +0200 (Thu, 06 Aug 2009) | 6 lines backport: BUG: 141699, BUG: 40920 Handle the case when the POP server closes the connection after returning the result, e.g. +OK 0 messages after the LIST command ........ ................ r1010914 | tmcguire | 2009-08-13 17:44:03 +0200 (Thu, 13 Aug 2009) | 16 lines Recorded merge of revisions 1008812 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs ........ r1008812 | winterz | 2009-08-08 14:53:24 +0200 (Sat, 08 Aug 2009) | 12 lines Backport r1008762 by cgiboudeaux from trunk to the 4.3 branch: Add the Chinese holidays. The file was provided by Patrick Nagel (mail at patrick-nagel dot net). Thank you. CCBUG: 202911 BACKPORT: 4.3 ........ ................ r1010915 | tmcguire | 2009-08-13 17:44:54 +0200 (Thu, 13 Aug 2009) | 9 lines Merged revisions 1009437 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs ........ r1009437 | djarvie | 2009-08-10 02:53:22 +0200 (Mon, 10 Aug 2009) | 2 lines Improve apidox ........ ................
................
r1013372 | tmcguire | 2009-08-19 20:52:23 +0200 (Wed, 19 Aug 2009) | 19 lines Merged revisions 1010804 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs ................ r1010804 | winterz | 2009-08-13 15:42:11 +0200 (Thu, 13 Aug 2009) | 12 lines Merged revisions 1010451 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1010451 | winterz | 2009-08-12 10:21:09 -0400 (Wed, 12 Aug 2009) | 5 lines show the [Record into my calendar] button on updated invitations when sharing a calendar with others who have access rights. kolab/issue3776 MERGE: e4,trunk ........ ................
................
r1013373 | tmcguire | 2009-08-19 20:55:02 +0200 (Wed, 19 Aug 2009) | 19 lines Merged revisions 1010837 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs ................ r1010837 | winterz | 2009-08-13 16:22:11 +0200 (Thu, 13 Aug 2009) | 12 lines Merged revisions 1010833 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1010833 | winterz | 2009-08-13 10:16:16 -0400 (Thu, 13 Aug 2009) | 5 lines In acceptPublish(), make sure to transfer UID and SchedulingUID properly when assigning incidences, as done by Volker yesterday in acceptRequest(). [Even though nothing in kdepim uses Scheduler::acceptPublish().] MERGE: e4,trunk ........ ................
................
r1013374 | tmcguire | 2009-08-19 20:56:18 +0200 (Wed, 19 Aug 2009) | 20 lines Merged revisions 1012351 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs ................ r1012351 | winterz | 2009-08-17 16:17:36 +0200 (Mon, 17 Aug 2009) | 13 lines Merged revisions 1012347 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1012347 | winterz | 2009-08-17 10:09:27 -0400 (Mon, 17 Aug 2009) | 6 lines fix Anniversary display prints: - if the spouse is just 1 first name - don't print "Birthday" in the event viewer kolab/issue3819 MERGE: e4,trunk ........ ................
................
r1013375 | tmcguire | 2009-08-19 20:58:16 +0200 (Wed, 19 Aug 2009) | 20 lines Merged revisions 1012416 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs ................ r1012416 | winterz | 2009-08-17 18:39:00 +0200 (Mon, 17 Aug 2009) | 13 lines Merged revisions 1011424 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1011424 | winterz | 2009-08-14 11:56:36 -0400 (Fri, 14 Aug 2009) | 6 lines If the invitation is in a shared-writable calendar, don't delete the invitation on decline except by the owner. kolab/issue3811 MERGE: e4,trunk ........ ................
................
r1013378 | tmcguire | 2009-08-19 21:00:06 +0200 (Wed, 19 Aug 2009) | 18 lines Merged revisions 1012629 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs ................ r1012629 | winterz | 2009-08-18 00:09:53 +0200 (Tue, 18 Aug 2009) | 11 lines Merged revisions 1012618 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1012618 | winterz | 2009-08-17 17:55:24 -0400 (Mon, 17 Aug 2009) | 4 lines deal appropriately with UTF8 filenames and link invitation attachments. kolab/issue3717 MERGE: e4,trunk ........ ................
................
svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1013489