-
Volker Krause authoredMerged revisions 1048284,1048439,1048476,1048499,1048502,1048705,1049028,1049066,1049276,1049362,1049366,1049415,1049424,1049569,1049595,1049600,1049603,1049606,1049662,1049672,1049845,1049859,1049864,1050137,1050139,1050192,1050201,1050234,1050333,1050441,1050505,1050539,1050556,1050789 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ................ r1048284 | winterz | 2009-11-13 03:08:28 +0100 (Fri, 13 Nov 2009) | 3 lines use the new view-calendar-journal icon for the Journal view. MERGE: none ................ r1048439 | scripty | 2009-11-13 11:27:14 +0100 (Fri, 13 Nov 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1048476 | tokoe | 2009-11-13 13:11:44 +0100 (Fri, 13 Nov 2009) | 5 lines Allow the user to decide whether he wants to use all contacts from a folder with or without the subfolders. BUG: 214141 ................ r1048499 | tmcguire | 2009-11-13 14:06:27 +0100 (Fri, 13 Nov 2009) | 428 lines Block cyclic merges, blocks, release stuff, etc SVN_MERGE SVN_SILENT Blocked revisions 1045877,1045879,1045940,1045942,1045945,1045947-1045949,1045951,1045967,1045973,1046090,1046097,1047704 via svnmerge ................ r1045877 | winterz | 2009-11-06 23:16:10 +0100 (Fri, 06 Nov 2009) | 8 lines Blocked revisions 1045788 via svnmerge ........ r1045788 | tmcguire | 2009-11-06 14:51:18 -0500 (Fri, 06 Nov 2009) | 1 line Fix build. ........ ................ r1045879 | winterz | 2009-11-06 23:18:35 +0100 (Fri, 06 Nov 2009) | 9 lines Merged revisions 1045821 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1045821 | tmcguire | 2009-11-06 15:25:06 -0500 (Fri, 06 Nov 2009) | 1 line SVN_SILENT less verbose debug ........ ................ r1045940 | tmcguire | 2009-11-07 00:41:02 +0100 (Sat, 07 Nov 2009) | 256 lines Block cyclic merges, KAlarm, message list, release stuff, scripty, ... SVN_SILENT Blocked revisions 1040916,1041157-1041162,1041164,1041167-1041168,1041425,1041772,1041911,1042075,1042474,1042477,1042480,1042487,1042513,1042553,1043157,1043445,1044030,1044036 via svnmerge ................ r1040916 | scripty | 2009-10-27 05:36:20 +0100 (Tue, 27 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1041157 | tmcguire | 2009-10-27 15:12:31 +0100 (Tue, 27 Oct 2009) | 20 lines Backport r1040986 by tmcguire from trunk to the 4.3 branch: Merged revisions 1033123 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1033123 | winterz | 2009-10-09 16:39:33 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1033101 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1033101 | tmcguire | 2009-10-09 09:34:51 -0400 (Fri, 09 Oct 2009) | 3 lines Don't allow selecting entries without email addresses. Fixes kolab/issue1499 ........ ................ ................ r1041158 | tmcguire | 2009-10-27 15:13:07 +0100 (Tue, 27 Oct 2009) | 21 lines Backport r1040990 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1033126 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1033126 | winterz | 2009-10-09 16:45:22 +0200 (Fri, 09 Oct 2009) | 10 lines Merged revisions 1033109 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1033109 | tmcguire | 2009-10-09 09:47:11 -0400 (Fri, 09 Oct 2009) | 3 lines Use the KPIM namespace here, to avoid symbol clashes with the class with the same name in kaddressbook ........ ................ ................ r1041159 | tmcguire | 2009-10-27 15:14:37 +0100 (Tue, 27 Oct 2009) | 16 lines Backport r1041056 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1034833 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r1034833 | winterz | 2009-10-13 18:45:57 +0200 (Tue, 13 Oct 2009) | 5 lines do not print the timezone countrycode in the tooltip if that value is empty. part of the fix for kolab/issue3493 MERGE: trunk,4.3 ........ ................ r1041160 | tmcguire | 2009-10-27 15:15:28 +0100 (Tue, 27 Oct 2009) | 23 lines Backport r1041058 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1035201 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1035201 | winterz | 2009-10-14 16:29:06 +0200 (Wed, 14 Oct 2009) | 12 lines Merged revisions 1035198 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1035198 | winterz | 2009-10-14 10:20:57 -0400 (Wed, 14 Oct 2009) | 5 lines a possible fix for the Marcus Bains line QTimer interfering with the KCheckAccelerator QTimer. This is hard to reproduce so I'm not sure. kolab/issue3903 MERGE: e4,trunk,4.3 ........ ................ ................ r1041161 | tmcguire | 2009-10-27 15:16:36 +0100 (Tue, 27 Oct 2009) | 22 lines Backport r1041060 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1035645 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1035645 | winterz | 2009-10-15 17:23:00 +0200 (Thu, 15 Oct 2009) | 11 lines Merged revisions 1035643 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1035643 | winterz | 2009-10-15 11:19:55 -0400 (Thu, 15 Oct 2009) | 5 lines revert part of the kolab/issue: give the marcusbains QTimer a parent. fingers-crossed. for kolab/issue3903 MERGE: e4,trunk,4.3 ........ ................ ................ r1041162 | tmcguire | 2009-10-27 15:22:03 +0100 (Tue, 27 Oct 2009) | 25 lines Backport r1041074 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1036130 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1036130 | winterz | 2009-10-16 18:53:22 +0200 (Fri, 16 Oct 2009) | 14 lines Merged revisions 1036104 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1036104 | winterz | 2009-10-16 12:10:07 -0400 (Fri, 16 Oct 2009) | 7 lines Do not set any buttons as the default and put the initial focus in the event viewer area. This makes it harder for the user to inadvertantly press <enter> and dismiss a reminder. kolab/issue3807 MERGE: e4,trunk,4.3 ........ ................ ................ r1041164 | tmcguire | 2009-10-27 15:23:28 +0100 (Tue, 27 Oct 2009) | 21 lines Backport r1041051 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1034385 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1034385 | winterz | 2009-10-12 17:16:20 +0200 (Mon, 12 Oct 2009) | 10 lines Merged revisions 1034349 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1034349 | winterz | 2009-10-12 10:03:39 -0400 (Mon, 12 Oct 2009) | 3 lines also don't load the calendar in these summaries. MERGE: e4,trunk,4.3 (the sdsummarywidget fix only) ........ ................ ................ r1041167 | tmcguire | 2009-10-27 15:27:58 +0100 (Tue, 27 Oct 2009) | 22 lines Backport r1041068 by tmcguire from trunk to the 4.3 branch: SVN_MERGE Merged revisions 1035635 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ................ r1035635 | winterz | 2009-10-15 16:54:57 +0200 (Thu, 15 Oct 2009) | 11 lines Merged revisions 1035625 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1035625 | winterz | 2009-10-15 10:32:38 -0400 (Thu, 15 Oct 2009) | 4 lines With fancy headers, deal nicely with very long attachment names or descriptions. fixed kolab/issue3908 MERGE: e4,trunk,4.3 ........ ................ ................ r1041168 | tmcguire | 2009-10-27 15:28:44 +0100 (Tue, 27 Oct 2009) | 5 lines Backport r1041108 by mlaurent from trunk to the 4.3 branch: Fix config name error ................ r1041425 | djarvie | 2009-10-28 01:03:10 +0100 (Wed, 28 Oct 2009) | 2 lines Disable 'New Alarm from Template' action when no alarm templates exist ................ r1041772 | mkoller | 2009-10-28 14:45:57 +0100 (Wed, 28 Oct 2009) | 3 lines backport bug 211327 correctly save the last selected message when leaving a folder ................ r1041911 | djarvie | 2009-10-28 21:03:25 +0100 (Wed, 28 Oct 2009) | 1 line Clarification ................ r1042075 | scripty | 2009-10-29 05:21:10 +0100 (Thu, 29 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1042474 | cgiboudeaux | 2009-10-29 22:38:48 +0100 (Thu, 29 Oct 2009) | 1 line Bump version. ................ r1042477 | cgiboudeaux | 2009-10-29 22:41:11 +0100 (Thu, 29 Oct 2009) | 1 line Bump version. ................ r1042480 | cgiboudeaux | 2009-10-29 22:43:40 +0100 (Thu, 29 Oct 2009) | 1 line Bump version. ................ r1042487 | cgiboudeaux | 2009-10-29 22:53:31 +0100 (Thu, 29 Oct 2009) | 1 line Bump version. ................ r1042513 | djarvie | 2009-10-30 00:53:27 +0100 (Fri, 30 Oct 2009) | 3 lines Bug 211696: in a dual screen system, show alarm window in other screen if the active window is full screen. ................ r1042553 | scripty | 2009-10-30 05:04:20 +0100 (Fri, 30 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1043157 | djarvie | 2009-10-31 23:10:05 +0100 (Sat, 31 Oct 2009) | 2 lines Bug 211696: If dual screens, show alarm in other screen if active window is full screen ................ r1043445 | djarvie | 2009-11-01 16:19:47 +0100 (Sun, 01 Nov 2009) | 2 lines Prevent infinite loop if NEXTRECUR time in alarm is before alarm start time ................ r1044030 | mkoller | 2009-11-02 22:29:22 +0100 (Mon, 02 Nov 2009) | 7 lines Backport r1044028 by mkoller from trunk to the 4.3 branch: CCBUG: 212304 really keep the backgroundcolor setting of a tag ................ r1044036 | mkoller | 2009-11-02 22:40:41 +0100 (Mon, 02 Nov 2009) | 2 lines revert last change as backgroundcolor of a tag is only a trunk feature ................ ................ r1045942 | tmcguire | 2009-11-07 00:49:58 +0100 (Sat, 07 Nov 2009) | 13 lines Merged revisions 1041099 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1041099 | winterz | 2009-10-27 12:27:17 +0100 (Tue, 27 Oct 2009) | 8 lines Backport r1041097 by winterz from trunk to the 4.3 branch: merge SVN commit 1041096 by sebsauer from the akonadi-ports branch: Finally fixed the jumping items i9n the monthview. Guess that bug is present in all KOrganizer versions. The problem is, that the case that 2 incidences which are both scheduled for a whole day are randomly sorted. Now we are using greaterThanFallback which also compares times and falls back to the id's. That way we are sure the sorting is stable. ........ ................ r1045945 | tmcguire | 2009-11-07 00:56:11 +0100 (Sat, 07 Nov 2009) | 11 lines Merged revisions 1041165 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1041165 | tmcguire | 2009-10-27 15:26:47 +0100 (Tue, 27 Oct 2009) | 5 lines Backport r1040468 by mlaurent from trunk to the 4.3 branch: Fix mem leak ........ ................ r1045947 | tmcguire | 2009-11-07 00:58:06 +0100 (Sat, 07 Nov 2009) | 21 lines Merged revisions 1041973,1041976 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1041973 | tmcguire | 2009-10-28 23:06:07 +0100 (Wed, 28 Oct 2009) | 5 lines Backport r1041850 by tmcguire from trunk to the 4.3 branch: Deal with broken HTML mails produced by apple mail. ........ r1041976 | tmcguire | 2009-10-28 23:13:30 +0100 (Wed, 28 Oct 2009) | 9 lines Backport r1041974 by tmcguire from trunk to the 4.3 branch: Upps, don't hide attachments for broken mails from Apple Mail when prefering plain text. Now you see both plain text and HTML code, but there is no easy workaround for that, for those broken mails. When prefering HTML, they are displayed fine. ........ ................ r1045948 | tmcguire | 2009-11-07 00:59:04 +0100 (Sat, 07 Nov 2009) | 16 lines Merged revisions 1043972 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1043972 | tmcguire | 2009-11-02 20:21:46 +0100 (Mon, 02 Nov 2009) | 10 lines Backport r1043961 by tmcguire from trunk to the 4.3 branch: Possibly fix a crash when exiting KMail, because the scheduler was never told to disconnect the slave. Bug figured out by honda@math.sci.hokudai.ac.jp, thanks very much! BUG: 199375 ........ ................ r1045949 | tmcguire | 2009-11-07 00:59:54 +0100 (Sat, 07 Nov 2009) | 13 lines Merged revisions 1044040 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim ........ r1044040 | mkoller | 2009-11-02 22:57:02 +0100 (Mon, 02 Nov 2009) | 7 lines Backport r1044039 by mkoller from trunk to the 4.3 branch: CCBUG: 212087 mail source shall always be shown left-to-right ........ ................ r1045951 | tmcguire | 2009-11-07 01:06:54 +0100 (Sat, 07 Nov 2009) | 15 lines Block this, it is just conflicts here. SVN_SILENT Blocked revisions 1044891 via svnmerge ........ r1044891 | winterz | 2009-11-04 22:24:08 +0100 (Wed, 04 Nov 2009) | 8 lines Backport r1043556 by winterz from trunk to the 4.3 branch: merge SVN commit r1043549 by tilladam from akonadi-ports: Avoid moving the buttons as they are being clicked by keeping them pushed to the sides at all times. MERGE: 4.3 ........ ................ r1045967 | tmcguire | 2009-11-07 01:54:42 +0100 (Sat, 07 Nov 2009) | 1 line Update newslog.txt. ................ r1045973 | tmcguire | 2009-11-07 01:58:34 +0100 (Sat, 07 Nov 2009) | 1 line SVN_SILENT Update version numbers for today's release. ................ r1046090 | winterz | 2009-11-07 14:24:39 +0100 (Sat, 07 Nov 2009) | 16 lines Blocked revisions 1045963,1045966,1045968 via svnmerge ........ r1045963 | tmcguire | 2009-11-06 19:45:25 -0500 (Fri, 06 Nov 2009) | 1 line Update NewsLog.txt ........ r1045966 | tmcguire | 2009-11-06 19:53:55 -0500 (Fri, 06 Nov 2009) | 1 line SVN_SILENT fix date ........ r1045968 | tmcguire | 2009-11-06 19:55:16 -0500 (Fri, 06 Nov 2009) | 1 line SVN_SILENT Update version numbers for today's release. ........ ................ r1046097 | winterz | 2009-11-07 15:21:29 +0100 (Sat, 07 Nov 2009) | 8 lines Blocked revisions 1043863 via svnmerge ........ r1043863 | ludwigreiter | 2009-11-02 09:40:23 -0500 (Mon, 02 Nov 2009) | 2 lines Update fixed issues after test of the 2009-10-30 version ........ ................ r1047704 | winterz | 2009-11-11 22:26:51 +0100 (Wed, 11 Nov 2009) | 3 lines remove debug areas MERGE: none ................ ................ r1048502 | tmcguire | 2009-11-13 14:09:01 +0100 (Fri, 13 Nov 2009) | 19 lines Block empty commit. SVN_SILENT SVN_MERGE Blocked revisions 1047216 via svnmerge ................ r1047216 | winterz | 2009-11-10 19:03:05 +0100 (Tue, 10 Nov 2009) | 10 lines Merged revisions 1047211 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1047211 | winterz | 2009-11-10 12:58:55 -0500 (Tue, 10 Nov 2009) | 3 lines make wording on the '[Record]' buttons more consistent. MERGE: e4,trunk ........ ................ ................ r1048705 | tokoe | 2009-11-13 20:52:43 +0100 (Fri, 13 Nov 2009) | 2 lines Use KDEPIM_VERSION instead of hardcoded value ................ r1049028 | scripty | 2009-11-14 11:19:42 +0100 (Sat, 14 Nov 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1049066 | yurchor | 2009-11-14 12:42:45 +0100 (Sat, 14 Nov 2009) | 1 line typo fix ................ r1049276 | ahartmetz | 2009-11-15 00:23:17 +0100 (Sun, 15 Nov 2009) | 1 line link with gold ................ r1049362 | tokoe | 2009-11-15 08:26:08 +0100 (Sun, 15 Nov 2009) | 2 lines Port from KABC::StdAddressBook to Akonadi ................ r1049366 | tokoe | 2009-11-15 09:08:31 +0100 (Sun, 15 Nov 2009) | 2 lines Port from StdAddressBook to Akonadi ................ r1049415 | tokoe | 2009-11-15 10:30:56 +0100 (Sun, 15 Nov 2009) | 2 lines Port StdAddressBook to Akonadi ................ r1049424 | tokoe | 2009-11-15 10:34:03 +0100 (Sun, 15 Nov 2009) | 2 lines Port from KABC::StdAddressBook to Akonadi ................ r1049569 | toma | 2009-11-15 14:30:03 +0100 (Sun, 15 Nov 2009) | 2 lines Add support for the QPixmap type payloads in the console. ................ r1049595 | guymaurel | 2009-11-15 15:28:27 +0100 (Sun, 15 Nov 2009) | 1 line complete with some more parentheses ................ r1049600 | guymaurel | 2009-11-15 15:40:38 +0100 (Sun, 15 Nov 2009) | 1 line remove the not used functions "iconForSignature" and "color" ................ r1049603 | guymaurel | 2009-11-15 15:46:39 +0100 (Sun, 15 Nov 2009) | 1 line removed the unused local functions "strings2urls" and "urls2strings" ................ r1049606 | guymaurel | 2009-11-15 15:52:45 +0100 (Sun, 15 Nov 2009) | 1 line delete the lines with unsued variables "sign" and "encr" ................ r1049662 | guymaurel | 2009-11-15 17:50:34 +0100 (Sun, 15 Nov 2009) | 1 line put the declaration of "useProgress" also in the "#if 0"-block ................ r1049672 | djarvie | 2009-11-15 18:09:46 +0100 (Sun, 15 Nov 2009) | 2 lines Make it work properly with full screen Xinerama windows ................ r1049845 | pokrzywka | 2009-11-16 00:53:21 +0100 (Mon, 16 Nov 2009) | 1 line missing Boost include dir, for shared_ptr ................ r1049859 | mjansen | 2009-11-16 01:18:49 +0100 (Mon, 16 Nov 2009) | 1 line Add SOPRANO_INCLKUDE_DIR to fix the build. ................ r1049864 | pokrzywka | 2009-11-16 01:25:52 +0100 (Mon, 16 Nov 2009) | 1 line we need strigi streams as well, for StreamBase<char> (actually for its parent StreamBaseBase) ................ r1050137 | djarvie | 2009-11-16 19:31:42 +0100 (Mon, 16 Nov 2009) | 1 line Fix disconnect() of non-existent timer ................ r1050139 | djarvie | 2009-11-16 19:34:15 +0100 (Mon, 16 Nov 2009) | 2 lines Bug 213019: fix for possible crash on exit. ................ r1050192 | tmcguire | 2009-11-16 21:45:12 +0100 (Mon, 16 Nov 2009) | 2 lines Fix porting bug, we're in FuncIs_Not_InAddressbook here. ................ r1050201 | tmcguire | 2009-11-16 22:00:17 +0100 (Mon, 16 Nov 2009) | 2 lines Reduce code duplication a bit ................ r1050234 | djarvie | 2009-11-16 23:25:43 +0100 (Mon, 16 Nov 2009) | 3 lines Bug 213461: Fix crash if editing alarm from alarm window Edit button, and window changes from reminder to normal, or from at-login to final at-login trigger time. ................ r1050333 | djarvie | 2009-11-17 10:22:45 +0100 (Tue, 17 Nov 2009) | 1 line Resize window when cancelling reminder ................ r1050441 | scripty | 2009-11-17 11:40:44 +0100 (Tue, 17 Nov 2009) | 1 line SVN_SILENT made messages (.desktop file) ................ r1050505 | cgiboudeaux | 2009-11-17 14:29:51 +0100 (Tue, 17 Nov 2009) | 5 lines Better solution for the dependency issue in Kalarm: Instead of disabling the whole application, only the akonadi resource will be skipped. This way, Kalarm will be available in KDE 4.4 ................ r1050539 | tokoe | 2009-11-17 16:30:04 +0100 (Tue, 17 Nov 2009) | 3 lines Prepare ContactsTreeModel and ContactsFilterModel to be moved to kdepimlibs/akonadi/contact/ ................ r1050556 | guymaurel | 2009-11-17 17:13:53 +0100 (Tue, 17 Nov 2009) | 1 line delete the unused variable 'codec' ................ r1050789 | vkrause | 2009-11-18 10:23:55 +0100 (Wed, 18 Nov 2009) | 3 lines Exlude files generated by moc and uic from the coverage analysis and ignore icecream errors. ................ svn path=/branches/work/akonadi-ports/kdepim/; revision=1050885
ddba3753