Changes to 'dev/displayou'

Sandro Knauß knauss at kolabsys.com
Thu Jun 12 21:52:01 CEST 2014


New branch 'dev/displayou' available with the following commits:
commit e2d5d05474080d46a3e8ccd7b7e044ee3cb09335
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Thu Jun 12 21:29:47 2014 +0200

    Display OU at addresslineedit

commit 75a799112b6128d356cf6c0b725ee14fd967f654
Merge: 903c898 3e63289
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 14:06:06 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit 903c8982e212d4a5b0f5f5be307681b2c0aa2bfb
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 14:05:43 2014 +0200

    Continue to implement load template

commit 3e63289fad1e934dffa3e564fa3a95061169dad6
Merge: 1fa99ab d40ac91
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Jun 4 13:07:59 2014 +0200

    Merge branch 'KDE/4.13'

commit d40ac91a189584587f59d0f6f73b030416792085
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue May 27 11:58:10 2014 +0200

    Fix templateparsertest
    
    Broken by identation change in ee57356, which altered test input data.

commit 1fa99ab62ad0ec7e9d650b56a8dd3e58a03b24dd
Merge: 1275c96 4abb58f
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 09:07:58 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4abb58fc7714b269133bc3fda3a914af85178ee0
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 09:07:21 2014 +0200

    Update systray font too

commit 1275c96c428785acef88e0813d5790c4791e128c
Merge: 7d808c2 873e5a1
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 08:36:28 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 873e5a1c683ce114d74284e4b96fbd74da4fe5a8
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 08:33:49 2014 +0200

    Change message font when we change global font

commit 7d808c2c1569b8ee25e56e66eb6bfdeab501b413
Merge: 4c737c8 198eca7
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 07:21:58 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit 198eca77abab4351104894b60286a8e9e3b4e11a
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 07:18:19 2014 +0200

    4.13.2

commit 4c737c81ea4a41d945e2164a97ff37013e886c48
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jun 4 04:18:24 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 885d83f9fc7aee11d3d957e5c09437b5677266fd
Author: Montel Laurent <montel at kde.org>
Date:   Wed Jun 4 00:10:32 2014 +0200

    improve info dialog

commit c3a50c1e17a627ee3682efae1f69771c8f0aa849
Merge: 617495a 853b3cc
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 14:09:50 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 853b3cc9c5cde0a38fe0203916fe73c91240b598
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 14:07:23 2014 +0200

    Fix bug when we change favorite folder view mode. Dnd didn't work when we used list mode.
    
    CCMAIL: sabine at kde.org
    CCMAIL: faure at kde.org

commit 617495a817bda9d9966d5fab256bbdac80f4a1c1
Merge: aba74e7 17745c1
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 10:32:25 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 17745c1b9c2397223731449126cb91cd392c538a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 10:31:17 2014 +0200

    Don't add invalid info

commit aba74e7ddbbd8ffa9a1b5be7352d6e0558393ca0
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 10:19:44 2014 +0200

    Load list of reminder

commit 235c5a8742e22b38e0696bfe15c9ebade5dc6aa7
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 10:09:03 2014 +0200

    Load list of reminder

commit 8adf42cdb58a26cd93d8d2f12ae1d888977f4100
Author: Montel Laurent <montel at kde.org>
Date:   Tue Jun 3 09:58:00 2014 +0200

    Save/load settings

commit f6632106507282a9aaa7d31b721e3c9d6bf94ec2
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Jun 3 05:11:17 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 198410facb644a5d32922699147074b6921c6dcd
Author: Andreas Hartmetz <ahartmetz at gmail.com>
Date:   Tue Jun 3 03:25:17 2014 +0200

    Directory services widget: Expand the list view, not the buttons.
    
    The previous size policy would waste an enormous area for the buttons
    while the list view (which contains a good deal of information) stayed
    small.

commit b39986f0d405487e13420050804315de0b638fbf
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 23:03:31 2014 +0200

    Add vcard4

commit d6f155237589e991c8fb4cce28e1373c310da6cc
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 13:54:41 2014 +0200

    Improve agent. Add unittest. Add notifyrc

commit a8f04d9995d1176f4d2b514ca6e60da2d6e3a0bc
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 08:56:19 2014 +0200

    Add new class

commit 25108d6d0ca704b96f2a1ed08722971a674ab248
Merge: 6bace51 c00a041
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 08:35:28 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c00a041a07ac3a8e10fdefa49dfe581da5bfa4c2
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 08:34:40 2014 +0200

    Fix Bug 335118 - Contacts and Mail components are trying to use the same template disregarding user settings
    
    FIXED-IN: 4.13.2
    BUG: 335118

commit 6bace51c9293c2348cffb903efa149c63c176801
Author: Montel Laurent <montel at kde.org>
Date:   Mon Jun 2 08:16:28 2014 +0200

    Fix compile

commit b59db0f984ec96c5ccb95d49382d897117441fe2
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jun 2 04:29:54 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 8e0598496c955e9f2078339e2a882ffea1cee1f1
Author: David Jarvie <djarvie at kde.org>
Date:   Sun Jun 1 23:14:18 2014 +0100

    Update change log

commit ccc0f19664189fcdfc11ff4de47f4ce75f6feb5a
Author: Michael Bohlender <michael.bohlender at kdemail.net>
Date:   Sun Jun 1 21:52:34 2014 +0200

    fix typo

commit c3436bf3d9735d20caf09c0f95c272a7dd672888
Author: Michael Bohlender <michael.bohlender at kdemail.net>
Date:   Sun Jun 1 20:39:50 2014 +0200

    load message by ID and add some properties

commit ee502199e237f93b1e2b0ca604eaabd98e81ea9f
Author: Michael Bohlender <michael.bohlender at kdemail.net>
Date:   Sun Jun 1 19:03:52 2014 +0200

    add initial 'message' to the qml api

commit e959c2e0d56c511a4366c67d198d65ad3fd5d254
Author: Michael Bohlender <michael.bohlender at kdemail.net>
Date:   Tue May 20 23:40:23 2014 +0200

    initial scaffold for the qml mail api

commit 399a1023ee835b26f5be2eb20299bcf0b28c66c4
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 28 11:58:43 2014 +0200

    Improve++

commit 2a7f2259738c4e5f6f7bb9335ed09f744564a778
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue May 27 13:56:13 2014 +0200

    Add missing unittestenv to kaddressbook/sendmail tests

commit 15a6559c1aae1e93fe3eb79d23a7f272b85d577f
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue May 27 11:58:10 2014 +0200

    Fix templateparsertest
    
    Broken by identation change in ee57356, which altered test input data.

commit 8a0391c5b6f21dbbda74e57394509d9edbb2a271
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 27 04:58:44 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit aa7d1c404161b123ea946b4e66efec4d7ca60a5c
Author: l10n daemon script <scripty at kde.org>
Date:   Sun May 25 04:45:13 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 2f49b50a5c4f3f9588656a876a7413f58657abf4
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:55:38 2014 +0200

    Move code to class

commit d4a842b058ceac3984aaf15addd1244ae4092dd0
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:45:46 2014 +0200

    Activate good page

commit 7f5c9face7618ae09e0cc47f426e1e3cee15c4b1
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:42:08 2014 +0200

    continue to implement search duplicate contact

commit a166a7e3c33d99a2fd10c1b8a5ee835174230e3e
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:41:51 2014 +0200

    Add dialog box

commit 41664928adcebd038c32e87061829d2e786043e4
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:19:39 2014 +0200

    Clean up

commit 0e25eae9393ae43a2e8101918f2f5be7f5874636
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:15:35 2014 +0200

    Not necessary to export it

commit a2ee8531c4dc82093e97049a70a2a688a46bda1d
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 24 14:06:36 2014 +0200

    Continue to implement agent

commit 4164bbedcd94c2ef65a1583596a60e483393c8fa
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 19 19:24:49 2014 +0200

    Reactivate settings

commit 24e3d03c6d2511681b22a375f8fb5af6140483ca
Author: l10n daemon script <scripty at kde.org>
Date:   Thu May 22 04:36:06 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit df98f23288a9d5977c7698bcb0fd2e1cf18994e0
Author: l10n daemon script <scripty at kde.org>
Date:   Wed May 21 04:33:45 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit e991e14b22cc908c72423c3d4a5d4722150556b2
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 20 05:11:44 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 686616008b9ef814507abb3c3351a95067f69f17
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 19 18:01:09 2014 +0200

    Add desktop file, dbus adaptor

commit f5d24fa269c46994fff4e4c04b02645d305b528a
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 19 17:57:13 2014 +0200

    Debug--

commit 0a6fd9298dcf50903cb704df96a575f05ad8274e
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 19 17:51:00 2014 +0200

    Restart to implement followupreminderagent

commit 970df96bb0ba105ac9a64bd68b3e23da6d44504a
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 19 11:19:43 2014 +0200

    Minor optimization

commit 6cefe3aa1361202c92c4914101b0a1aa71596be2
Merge: 7941d5f e3b1eb8
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 17 14:25:13 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e3b1eb838c4d14be616bd90c0f7f19dedce5f58f
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 17 14:22:05 2014 +0200

    Fix Bug 334937 - Kmail crashes when attaching a file if "enable detection of missing attachments" is not selected
    
    FIXED-IN: 4.13.2
    BUG: 334937

commit 7941d5fb194e15e0e21580bb08f92be7ba00f188
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 17 14:19:29 2014 +0200

    Improve load settings

commit df0a340a3cb284a4033b8287d2ddfff022dfd474
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 17 10:43:08 2014 +0200

    Continue to implement load template

commit e7e488fa0dbd4105ef23249efed6597e2d904c19
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 20:33:54 2014 +0200

    improve save/load template

commit 36a51866a2ab5586ba7e47f1585223556e2d704c
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 14:03:02 2014 +0200

    Allow to export selection type

commit f4e12e6a57cd82106912d3084cf2b4559559568c
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 13:37:41 2014 +0200

    Fix can't send new mail when emails address is not valid

commit dfb5e56346ae09101d1e933803372ef2f863a259
Merge: 563d7a4 706a8dc
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 09:59:49 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 706a8dcfd97110ca2de7e7f2101263107ba7eca2
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 08:03:35 2014 +0200

    It's default but better to add matchtype

commit 563d7a441d948b478d31e0278115faf511821cfc
Merge: 45afd5e b71b07a
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 07:49:55 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b71b07a9ab8f991d9abf389dcba0dde8a18224c7
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 07:45:03 2014 +0200

    Not create error when we cancel select default collection

commit 45afd5e4a0d9e75cac393ab3011bb1deb6a9c755
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 16 07:37:25 2014 +0200

    Minor

commit e6337cd8085b263fccb7bb3736bc4669c3d66f9e
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 22:14:10 2014 +0200

    Remove it

commit 824c7ee4843feea12310c7d5fcbfc6d9d121a150
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 22:11:02 2014 +0200

    not necessary

commit 3a1b93f4564a7e5e2973192fd18628e253fe11c1
Merge: 9509144 6fa65d3
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 20:39:59 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kaddressbook/xxport/vcard/vcard_xxport.cpp

commit 6fa65d3c170b5be14f8d18c28f0a9ce6d5960b60
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 20:35:55 2014 +0200

    Fix indent

commit 9509144dc0fbf04bd112168d3eec07bc3161dca5
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:56:23 2014 +0200

    Add comment

commit 48c05aba39c194e2736e1a81e31b6cc583e021ac
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:52:05 2014 +0200

    Add item in contextmenu too

commit ce83bee5e6eb55c16dffe4d6c3eacf402ea10e07
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:43:54 2014 +0200

    Improve unittest

commit fed91306e733962cb120dfe5156fb77b4807c5a6
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:41:20 2014 +0200

    Clean up and start job :)

commit 8b26b739d8b6f59faf56a7c11d9fde60c52bba86
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:36:45 2014 +0200

    Rename as *job

commit edc7c919e218104f947d9a5f716c38703d317b4a
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 15 13:29:54 2014 +0200

    Adapt make it compile, fix code form kevin student about "send mail" action, add unittest

commit e8da96e2f4201857d1e8efed86bfc0bd6c3edaba
Merge: 0473deb 990d6c8
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 14 21:33:06 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 990d6c87eb243d03f7c067d661278cf3aff22fed
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 14 21:31:10 2014 +0200

    Fix Bug 334730 - Kontact crash on logout
    
    BUG: 334730
    FIXED-IN: 4.13.2

commit 0473debd3f9b48a5cfb5f162ab93f424fb292318
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 14 08:30:06 2014 +0200

    Fix i18n

commit 9900c64abd23f8032c1f763a8465ba427deba2a6
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 14 08:12:21 2014 +0200

    Fix enable/disable action

commit 3bb3c2c8cc2a1927c89771a6d1afc650fb7c1e95
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 14 08:03:41 2014 +0200

    Reactivate code

commit 286d92bbee771ba132d8890a7c059c40cbcb3fc9
Merge: d901618 f0567ac
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 22:11:45 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	storageservicemanager/storageservicemanager.desktop

commit f0567aca5391f2afb460acacf324671dd8d7f875
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 22:10:06 2014 +0200

    Fix indent

commit d901618e5d1151b24275edc0f28760ab4c3b0fa4
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 22:06:43 2014 +0200

    Fix Bug 63780 - Auto-render HTML for certain email addresses
    
    FIXED-IN: 4.14
    BUG: 63780

commit 1f2706ccef9be5a1bc548095af7b3e5a5de11193
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 13:57:03 2014 +0200

    Update message

commit b28ec3e81ad2f4a4f8b3a2025d5032b7778b273f
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 13:53:50 2014 +0200

    Continue to implement display message menu

commit 45c3ae11f08f8a914dacb34bca22e4015b5c17c2
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 13:24:17 2014 +0200

    Improve formatactionmenu

commit 783af114dcaaacd39876e7a36cfa267c06aade05
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 13:24:07 2014 +0200

    Rename variable

commit 3870cda1fa5b3b3237e2fc8030143a5f2926d402
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 09:46:13 2014 +0200

    Try to test signal value

commit cfed86d11cb1a1e152f0020e4e29ce4f4ad55a82
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 09:37:41 2014 +0200

    Emit signal when we click on item

commit b37bf2c72466d4e5a0bdc755df0a594e14b4a158
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 09:10:02 2014 +0200

    Create submenu

commit ebf93faf7d07f251e3ae83d04ba299431354aac3
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 08:27:06 2014 +0200

    Add class for message format

commit 6b0b00ef72da63565bfc5354236330e337692e94
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 08:02:33 2014 +0200

    Continue to implement change display message format

commit 16a4600c5476f953f22e11ae173221e1b31eb22a
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 07:47:33 2014 +0200

    initialize value

commit 9bd1f738895f28e6f91b937b0b343d5d1beae781
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 13 07:39:27 2014 +0200

    Rename enum, adapt code to fix bug 63780 (in progress)

commit 3da20614e7387cb4fb5747feb57a51578de08328
Author: l10n daemon script <scripty at kde.org>
Date:   Mon May 12 07:24:25 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 49a0e1563937322883a97a98bd369bac47699212
Merge: 0c9ed22 fe5bc20
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 09:16:56 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0c9ed220ecddabbe94485f41f385a8c45e6835ff
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 09:16:39 2014 +0200

    Fix enable disable open editor/save button

commit 69e40c19ad5d7e84fa3e3c2557d943029bf437fe
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:52:55 2014 +0200

    Save config when necessary

commit fe5bc204b00a9fa0443ea92dc451873330f01b6a
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:52:26 2014 +0200

    Save when it's necessary

commit 4adaf0509c23818679a9bc26b5c9b44f25f6c58b
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:46:05 2014 +0200

    Use KStandardGuiItem::cancel

commit aa63bb172a95acb5ed9d10232015c2c8cee3029a
Merge: 0dc23d0 eef0ee1
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:29:23 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit eef0ee1780d7ff5c23ac509313f14646ab32a4c8
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:28:03 2014 +0200

    Remove not necessary code

commit 9d8a5cfedcbef35105ef7887794a4f5a8f19bb8f
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 08:17:25 2014 +0200

    Fix argument

commit 0dc23d0bccbb0fdc15ebf5183838be07d3ef6669
Merge: 2a32562 dc110d6
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 07:47:12 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dc110d65dcc38af6989ceb3d503271302539c937
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 07:46:03 2014 +0200

    Fix Bug 334612 - Selecting text and pressing enter doesn't replace the text but only adds a newline
    
    FIXED-IN: 4.13.1
    BUG: 334612

commit 2a32562471ed185ad845344bcf754f8d1e84612b
Merge: 43c831e e432a85
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 07:24:41 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit 43c831eb0dde9e672c13d2d568643a5e02256b6c
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 12 07:24:09 2014 +0200

    It was never ported/removed after baloo migration.

commit e432a85bebb0da80c6117407fe36a437e005cc28
Author: l10n daemon script <scripty at kde.org>
Date:   Mon May 12 04:33:18 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 621f13c2196d928134fa482747a7e61a1b54ad47
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Sun May 11 16:59:58 2014 +0300

    Fix typo found by Łukasz Wojniłowicz

commit 02062a2f657d4ca4b4cfad287f9bf3c510af12da
Merge: 2d72d60 ee57356
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 11 11:11:15 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ee57356e5ef0958de75c10152850bc7b4579f034
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 11 11:09:41 2014 +0200

    Fix indent

commit 1752255e9d85ec88222ea4bbe82aca40983c0d11
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 11 10:52:10 2014 +0200

    don't close dialog when we press enter in lineedit => add new item
    
    Clear line after add new item
    Don't add two items with same name

commit 2d72d608b321c7590e37660a454c92ae374725c8
Merge: bb7db56 55aa044
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 11 10:42:57 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 55aa044339cb1a70282fef4edd7e179f850c9bc3
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 11 10:41:36 2014 +0200

    Fix save/load size

commit bb7db5610fad2c6cab6d664ec351c367d01700be
Merge: 8f218c6 a78a90f
Author: David Jarvie <djarvie at kde.org>
Date:   Sat May 10 18:32:20 2014 +0100

    Merge commit 'a78a90f7246355a28d42430071cef12e4127da72'

commit a78a90f7246355a28d42430071cef12e4127da72
Author: David Jarvie <djarvie at kde.org>
Date:   Sat May 10 17:59:33 2014 +0100

    Bug 334334: Fix no Defer button in alarm windows restored after login
    
    Also fix duplicated alarm windows when alarm windows are restored
    after login.

commit 8f218c663be19c71946a1d1a3d6633cf8a55db26
Merge: 6e30b8f 76d6c34
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 10 08:53:04 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 76d6c3463dcb1b0d131bb16dbf03064e646794d1
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 10 07:48:24 2014 +0200

    Show errorString

commit 6e30b8ff0ef9549e13254f441bd522e04f1579f5
Author: Jonathan Marten <jjm at keelhaul.me.uk>
Date:   Fri May 9 20:43:07 2014 +0100

    KAddresBook VCF export: Set a default MIME type
    VCF import: Tidy up filter string

commit e4059c3cac4bd8bdb1a2cca894634a8b9515526c
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 8 08:57:27 2014 +0200

    Remove not necessary header

commit 7ae843612a5f8127cda568c81a30327c570a9586
Merge: 73f4c4f 5cacfd72
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 13:42:23 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5cacfd72ea4b007e62abf27a22ce2aec8529a01e
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 08:59:07 2014 +0200

    Verify that url is empty

commit 111ccf34e683d5da405e340ddfa68dc1bb682e4e
Author: l10n daemon script <scripty at kde.org>
Date:   Wed May 7 07:20:57 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 73f4c4f34debf8662c2ee3f020d91a33c45c0d8f
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 08:31:12 2014 +0200

    Allow to archive folder with dbus function

commit dde610167e229bd2cf02480b51d25817afe34acc
Merge: 7da0613 f923439
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 07:17:32 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f92343959bdbba9abb2b40a8d54feb7efbe8c27c
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 07:15:09 2014 +0200

    Make it compile too (it was necessary to change enum in all storageservice)

commit 7da061390ac4c9222faae623370dcd8056322606
Merge: 2a4cc82 097ba09
Author: Montel Laurent <montel at kde.org>
Date:   Wed May 7 07:06:05 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 097ba091f44dd45a476bd2429f1d0c5bf6f151ba
Author: Patrick Spendrin <ps_ml at gmx.de>
Date:   Wed May 7 02:18:55 2014 +0200

    adapt to library name

commit 2770b5437e15720b7bf8b02382acf3a4dbdd89bc
Author: Patrick Spendrin <ps_ml at gmx.de>
Date:   Wed May 7 02:18:17 2014 +0200

    readd header needed for windows

commit 01ce0c3b6d16817a48e547e2745d523462941e33
Author: Patrick Spendrin <ps_ml at gmx.de>
Date:   Wed May 7 02:17:53 2014 +0200

    fix clashes with MS API

commit 2a4cc8277a6210b36f76b3d841cd636bd4b8b172
Merge: 94321d9 80fdba5
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 22:36:57 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 94321d9d78ec46e030849845bbb5017da67993d1
Merge: dc99085 aa7adcb
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 22:36:51 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit dc990858f70949c9f231b73d1ae2a45ce2be1333
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 22:36:28 2014 +0200

    Fix cmakelists.txt

commit 80fdba505de09314c04186ce81a8bcf505c3a716
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 20:09:53 2014 +0200

    Fix print info

commit aa7adcb47c608e9b78503b922240cea0ef28e2a8
Merge: b529aec e2c67da
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 19:05:25 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e2c67dae266623faf345cbaabc615359bc7bd9eb
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Tue May 6 19:55:49 2014 +0300

    kleopatra: Replace some __GNUC__ checks with __GLIBCXX__ ones.
    
    The checks are around code specific to libstdc++, so use a stricter
    check since compilers such as clang also define __GNUC__, and the build
    fails if another standard C++ library is used (such as libc++).

commit 8c64e00460a173141d69624cb36fca19801405b4
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Sun May 4 23:33:29 2014 +0300

    Stop needlessly calling KDirWatch::stopScan().
    
    Not only should the call be unnecessary, but it also causes an infinite
    loop when KDirWatch is set to use QFileSystemWatcher: the
    KDirWatch::stopScan()/addDir()/startScan() combination makes the slot
    where they're called end up being infinitely triggered.
    
    Discussed with dfaure.
    
    REVIEW:		117993

commit b529aec8b6cf1a236a25c0974eae17397e0850b2
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 13:20:05 2014 +0200

    Fix icon

commit b0c9186bc267e833e92c31d79da3495ac934f14b
Merge: 80e83aa 68f4005
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 13:14:30 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 80e83aac35ce66a64ee04c1445436f74ec592669
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 13:13:32 2014 +0200

    Hide KMessageWidget when we close todowidget

commit 68f400504ba3b99789e6495c19e2a2f22bbaeeb7
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 09:32:22 2014 +0200

    Minor optimization

commit 63e65a4f2aa1f3f59ae339ff34925ee43b31d56e
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 09:26:58 2014 +0200

    Continue to implement merge contact

commit 4c4d2df2b18ef4aa5a56d283cf039d0217d419c0
Author: Montel Laurent <montel at kde.org>
Date:   Tue May 6 08:28:26 2014 +0200

    Be sure that item has is a "KABC::Addressee"

commit 95965dd103a51797aae692b1e752a0c1c3b73a16
Author: l10n daemon script <scripty at kde.org>
Date:   Tue May 6 04:56:23 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 410ec69a6ccf41295697f4ec99993cd51ae69d9d
Merge: 9b7c35e 0cfe8fb
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 22:33:19 2014 +0200

    t pMerge remote-tracking branch 'origin/KDE/4.13'

commit 9b7c35e1190d6831f762dad8ffff0e850f2addff
Merge: 92f6698 f52a9ad
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 22:33:17 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit 92f6698d608b4152f455fae412435c6c31ac3810
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 22:32:17 2014 +0200

    Add new class to save/load type selection as xml

commit 35c0f06edb17199d7257c758365317101526beb2
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 22:28:05 2014 +0200

    improve unittest

commit 0cfe8fb48cd3819fa66403214c7b2e8e5287421a
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 21:07:34 2014 +0200

    kontact: Fix switch to knotes plugins

commit eaa75b8b977eb1668986bd40d7c5a0ed2821e2e2
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 20:21:27 2014 +0200

    Readd code: When we don't have baloo we can filter list

commit f52a9ad5ec72f66f4663ec751ca9d2024a095000
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon May 5 19:22:31 2014 +0200

    Improve KMail's Create Todo/Event widgets
    
    REVIEW: 117849

commit 59c74508a7d7ca39ab7a1abcbfd449325a526e2f
Merge: 7303aba 6bb0e30
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 13:57:26 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6bb0e305e263d5bd645a513eab651b78a5c86cb4
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 13:56:45 2014 +0200

    When create new notes switch to knotes plugins

commit 7303abaf13c5bd8ad3a2c9416ad0c01a8de3c894
Merge: b4a3a7b 94efb10
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 13:25:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit 94efb108056e1c7cafcd74243ef5df28e4017395
Author: Montel Laurent <montel at kde.org>
Date:   Mon May 5 13:23:01 2014 +0200

    4.13.1

commit ac020b6c376bd104c37ae5ee3b25a3b9428cb075
Author: l10n daemon script <scripty at kde.org>
Date:   Mon May 5 07:16:46 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit b4a3a7b0ae4c1aa0d52b0526da076b14332765a0
Author: l10n daemon script <scripty at kde.org>
Date:   Mon May 5 04:29:43 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 2178dbe20dcd928674c0f47e3f4836b407475d2a
Author: David Jarvie <djarvie at kde.org>
Date:   Sun May 4 17:56:34 2014 +0100

    Bug 334334: Fix no Defer button in alarm windows restored after crash

commit c6347a568afc03b30dff3e0eec8d9e3a5ae4e1b3
Author: l10n daemon script <scripty at kde.org>
Date:   Sun May 4 07:35:13 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 9897090171e95f6e65e7b3f4f5d2f4121c33136d
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 08:21:44 2014 +0200

    Remove task attribute here too

commit 661922c6468c78224b81761768abc5f8d77d45f9
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 07:51:36 2014 +0200

    Remove todo comment

commit 3a1d6c100bc62bfeda4fce5039df93db772b3078
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 07:50:57 2014 +0200

    Allow to change status

commit 1cc59b855900de18c2328d2de704f49e674807dc
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 07:29:01 2014 +0200

    Add code from "lespetitspedestres" branch

commit 8c3a20875ce790c4229212c142da0a9cbff7edca
Merge: b12a7df 5490653
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 07:22:36 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5490653f772756c409dad7a8df384e4e1c351b91
Author: Montel Laurent <montel at kde.org>
Date:   Sun May 4 07:21:29 2014 +0200

    Fix load settings

commit b12a7df1bf070a1c7946f92a7b8342d56573f26d
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Sun May 4 00:59:23 2014 +0300

    exportmail.h: Include time.h for time_t.
    
    Fixes the build with libc++ on FreeBSD at least.

commit d689da624c85a3f7d4ad54a3ebe883601827196b
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Sun May 4 00:59:23 2014 +0300

    exportmail.h: Include time.h for time_t.
    
    Fixes the build with libc++ on FreeBSD at least.

commit a150c17791e9946265e8a5610ebbc19491e30881
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 3 18:41:09 2014 +0200

    Allow to test apps

commit 469a254d6635a1e41f7cba9a76240fd920ed4ca8
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 3 09:43:39 2014 +0200

    Increase combobox size

commit 1beba003be2bd72872b74f27d5d5bc4273948ebe
Author: Montel Laurent <montel at kde.org>
Date:   Sat May 3 09:42:24 2014 +0200

    Pedantic

commit bcaf790b776c469a631af8d1970553ea53828c7c
Author: Yuri Chornoivan <yurchor at ukr.net>
Date:   Sat May 3 08:42:17 2014 +0300

    Fix typos

commit 0a92fb453bad60345291d4e585d6266a41c84dae
Author: Jonathan Marten <jjm at keelhaul.me.uk>
Date:   Fri May 2 21:14:50 2014 +0100

    KAddressBook: Add a category filter
    
    This is a widget which by default appears to the right of the
    quick search bar.  Checking or unchecking categories in this list
    filters the entries that are shown.
    
    FEATURE:332103
    REVIEW:117834
    FIXED-IN:4.14
    GUI:

commit d2f62bd741a04cce5b8b539bbdc96508fa3419b1
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 14:39:00 2014 +0200

    delete job when we finished to search potential duplicate

commit 5614114d1e68235653b0d657fc5cfae4399fc443
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 13:06:14 2014 +0200

    Use Akonadi::Item::List

commit c7e8a70121ee4b6e5e4e30581521f2884250bbed
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 12:44:05 2014 +0200

    Fix unittest

commit 1fe7a2d44799f92af8f7fdfb31fad22046adf99b
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 10:07:13 2014 +0200

    Fix signal argument

commit 9676c1dbaa0457e1a6b653e820c0ae0422a04e09
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 09:06:15 2014 +0200

    Fix Bug 334142 - configure knotes collections are not distinguishible
    
    FIXED-IN: 4.14
    BUG: 334142

commit acde1300d4a0373d9ad9d8dfecc6f7f67f0551a3
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 09:03:04 2014 +0200

    Update treeview when we rename collection

commit 7e58cf8303b76add201376728f567d66b983d054
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 08:59:03 2014 +0200

    Return error

commit 7aff61b932d79a428aed098fcb60016bc38250a8
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 08:51:18 2014 +0200

    Continue to implement rename collection
    
    CCBUG: 334142

commit 80dd582548eca152835bef0da9ccde9af70f0716
Author: Montel Laurent <montel at kde.org>
Date:   Fri May 2 08:11:50 2014 +0200

    Start to implement rename note collection

commit 6cad1a9af9cc8c8966591591070d510edb9ee719
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 1 11:23:54 2014 +0200

    Minor

commit 4538ca2effcf2a74e6c2e5bc4ac32bb6095015d9
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 1 11:17:39 2014 +0200

    Add more test

commit 9b092fe5e20b17ab9dae7c8914f443f61b2882ca
Author: Montel Laurent <montel at kde.org>
Date:   Thu May 1 09:37:47 2014 +0200

    Improve test

commit cd6aa4c6f23a11af139ca90a65477f7de1e8c99c
Merge: 428631f cd78c5c
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 30 22:44:24 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 428631f06408c5e03f6697e101cc60a477903de2
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 30 22:42:42 2014 +0200

    Add new unittest

commit cd78c5cf7f1d1106a9a2b75a7c28a3eee4ed7670
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 30 20:00:36 2014 +0200

    Fix Bug 334140 - knotes don't preserve the title and other modifications if you lock the note
    
    FIXED-IN: 4.13.1
    BUG: 334140

commit 8e39edda03d5dbde7439fe5de418b301ef830b8e
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 30 13:58:42 2014 +0200

    Add new dialog when we search duplicate contacts

commit 8c50228c63fde58f7067e12f41a5f349c580e6e0
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 30 13:16:30 2014 +0200

    initialize pointer

commit 1464b69f1ceba29ea6ead1e3f5b0d5f2f86f34f5
Merge: 7f7346c a4986fe
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 22:25:51 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a4986fe40eb8c177058b88af0fd9edf5b1835c55
Author: Vishesh Handa <me at vhanda.in>
Date:   Tue Apr 29 18:55:48 2014 +0200

    AddressLineEdit: Do not lower case the completion results
    
    We use a hash<QString, QString> to aggregate all the results where the
    case is identical. We want to return the values and not the keys, as the
    keys has the case removed.
    
    CCMAIL: aacid at kde.org

commit 7f7346c1e6cd4c5d62f94e63f61be92dcd3613d7
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 13:46:39 2014 +0200

    Remove unused files

commit bbd9110ac73ff9673ae908c2cf8bfbd17c1e495a
Merge: ee65165 43b575e
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 13:39:17 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 43b575e43305238a7482dfc6c95ddde0d66f5c1e
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 13:37:26 2014 +0200

    Minor optimization

commit 0e994f6cfba83000d8f2f6f783f98b65a2e6c26d
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 13:24:31 2014 +0200

    Remove debug

commit ee651650cdef47cce3eab48e7b40889ca6f7bf15
Merge: f35be49 6c87a92
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 09:35:34 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit f35be49bfa27f24ef8a1674fa6a4a335a695f2ba
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 29 09:35:04 2014 +0200

    We need a function to show if we need to manual select items

commit 6c87a92035a72971a5421642bf80b02ce0741cb2
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Apr 29 04:52:31 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit a7f6ab750b443b1569352a68e3038068e0542383
Merge: 8058cfc 4709f34
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 19:29:08 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4709f343a381afb762e1fc0211f36e38167c88f8
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 19:25:17 2014 +0200

    Save/load dialog size

commit 653eb7bf6a18f3b9a7562b9a6e61c6b062616087
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 19:25:04 2014 +0200

    Fix mem leak

commit 8058cfcf49b74c11152852f2ff8985c9dc5c49a7
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Mon Apr 21 00:19:47 2014 +0200

    Make LdapClientSearch usable for other circumstances
    
    REVIEW: 17761

commit 1002b734ef985bdd79af6a718078896af7b15572
Merge: 996d586 71eba86
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 16:15:12 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 71eba8662f03d93098ab5804727e878b346a16ab
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 16:12:23 2014 +0200

    Fix bug found by david when we create a new composer from a composer. Template was not changed when we change identity

commit 996d586e30b54107bb93e9284d3429ded400c6ef
Merge: 71273f3 23164f2
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 08:02:16 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 23164f2ac500463833a42253e6e282e9a6274b4a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 28 08:00:23 2014 +0200

    increase migrate version number
    
    CCBUG: 333640

commit c6c7d34a7583826fdda937de1d5cd47c86b518d4
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 27 08:26:27 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 71273f3bdb75dadbb481d23bbe57502a74c4ec97
Author: David Faure <faure at kde.org>
Date:   Sun Apr 27 09:24:54 2014 +0200

    This was already ported away from queryExit -> clean up.

commit 99218fe29c5c15e3f1c7e65d032fe5e38beef3c9
Author: David Faure <faure at kde.org>
Date:   Sun Apr 27 09:16:53 2014 +0200

    Port away from queryExit by ... removing all this code.
    
    Everything works fine with kdelibs 4, closing the window and
    leaving the app running for the systray icon, quitting via window or
    quitting via systray, etc.

commit 86e6e2245ce1da0d867851ddc63caab2388bd2c5
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 27 05:22:32 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 8fc0d948f6e12102d38228857d686e65158534eb
Author: David Faure <faure at kde.org>
Date:   Sun Apr 27 01:29:32 2014 +0200

    Port away from deprecated queryExit
    
    Tested with and without a systray icon.

commit edd6e15cc92dab4471b7fbe385e1ac7cdd652c7e
Author: David Faure <faure at kde.org>
Date:   Sun Apr 27 01:21:11 2014 +0200

    Port from queryExit (deprecated) to closeEvent

commit 2108c7ac62111773d3afc461dd1e11ecf4114aa0
Merge: f122c85 b723476
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 26 18:41:13 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit f122c85836a7e4edcba9a6e86aee91a351cab5e3
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 26 18:40:54 2014 +0200

    Add comment about potential bug

commit b723476bbfbe4065a8dcb3ff4de64e7a2f388ace
Author: David Faure <faure at kde.org>
Date:   Sat Apr 26 18:29:38 2014 +0200

    Port from queryExit to closeEvent, since there's always only one mainwindow.
    
    Reviewed by Laurent Montel

commit 03c2a2d4c45ec83967029d4927bc6c741a00062d
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Apr 26 04:52:21 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 8bec5ecadf8be2bf7e3fdcfce381653ac2528081
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Apr 25 05:22:29 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 6a4f54102dade093f372ad4ba84392bb7d99cb3e
Merge: caab2bf 513af3e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 25 07:10:53 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit caab2bf65e43f2063bc681e979a3a6d7e357429f
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 20:28:18 2014 +0200

    Split tabwidget.

commit 513af3e545f3b06155b2cdbb1161b7541a929c51
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 20:00:05 2014 +0200

    Save/load dialog size

commit 141f84da1941c40363fec28287f8700bcba3e177
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 18:43:10 2014 +0200

    Oops forgot to commit from 2 weeks :)

commit e1338d2be23fe96ada508f2d0c9457026b16ae95
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Apr 24 17:01:09 2014 +0200

    Fix build of kalarm against KDE < 4.12.4

commit b7a06356b084456c039fb2e19917000a73afdb49
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 13:32:29 2014 +0200

    Improve++

commit f5cd6f453d0f2c78d6410224436de8306285b72f
Merge: 78b02af 224fbe9
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 13:20:21 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	storageservicemanager/storageservicemanager.desktop

commit 224fbe98398ce0cd483988a80b9fedd6ec3370fd
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 13:14:06 2014 +0200

    Show by default result of test. Even if it's ok.

commit 3d1564e374b20bd9dd51ef295e8ec2c7c089b12b
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 24 08:04:18 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 78b02af102a763fba93f1a8974871dc9518409ca
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 09:05:58 2014 +0200

    Use new centralwidget

commit dc86bbe277059c599d36765b093fe9e5315d0943
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 08:29:43 2014 +0200

    Add new central widget

commit 924ed506c489d89595685c507a174d571be4b4bd
Merge: 63ddce0 7e50416
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 07:47:04 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7e504166f90d36f4acb48c0141ee92d3925238da
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 24 07:45:50 2014 +0200

    Remove duplicate entry

commit 63ddce0c0311654472a455bf436b635909845a2b
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 24 05:01:07 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 756bd66be1aff5dfdf88dfeaf256f7fc51599853
Merge: 9bb5274 e415158
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 21:16:24 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e41515897c2701fec9892259735c2b81f55fa518
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 21:15:35 2014 +0200

    Fix Bug 333778 - Disabling "Enable detection of missing attachments" setting ignored
    
    FIXED-IN: 4.13.1
    BUG: 333778

commit 59f093a5621484aeeca8a2b3f5e4ce1f8e3b5968
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 23 07:55:42 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 9bb52747a8fd867cbce0d4d4930ff380bb908989
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 09:11:37 2014 +0200

    Don't merge when contact is empty

commit 9221795482d0a5396bc97a50c72ca3be7e9ec004
Merge: c763087 cfa002c
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 08:35:21 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit cfa002cdf0a93baa51d0c79ca816c1a418a2be65
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 08:12:25 2014 +0200

    Remove not necessary debug

commit c7630874b8df78aef9b6ae0b81e880c15970cd49
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 07:19:23 2014 +0200

    Improve unittest

commit b9db1412ddcd1fa8b435680cce816e848af7024c
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 23 07:11:47 2014 +0200

    It's already added

commit b5f1b5de91168f4c809ca3d1ffcc855085ba5d28
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 23 04:55:55 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit a99c4633817bd615c45b2cc1a2d0ecf8d3997d44
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 22 22:57:18 2014 +0200

    Add a button to configure when we don't have any service

commit 230bf640dec84b7ab1f30504b110a089496ed10c
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 22 22:56:55 2014 +0200

    Use better name

commit 242e3b47574d78b457ea68e60edee99dc0d20afe
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 22 13:38:39 2014 +0200

    Extract code which merge contact so I can create unittest

commit 446bed6f87004fbc46cecdc71f313e470932a105
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 21 07:57:49 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit e76150b0f1e72e17b8718918221bb9e1bc9d9ec7
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 21 04:56:09 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 13c92855655d1b75efca95e45306de2adc8e0e17
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 17:46:57 2014 +0200

    Use list of item

commit 2bb33476b017128fb0b771b7bfbf2f448c9f854f
Merge: 8e45507 dc60921
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 13:17:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dc6092128b8e6a0c56599853cc69377445e39073
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 13:16:05 2014 +0200

    Allow to add search text in completion

commit 8e455079bdb1a8c95fbe4e3e8c317325c8813f5f
Merge: 75d6e00 38cd7e2
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 11:41:34 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 38cd7e2fef12fd9eaab345ee1ec6ddc2057153f2
Author: Lindsay Mathieson <lindsay.mathieson at gmail.com>
Date:   Sun Apr 20 19:10:05 2014 +1000

    Fixes MailWebView::scrollToAnchor
    
    The DOM code in MailWebView::scrollToAnchor no longer seems to work.
    However there is a QT api call in QWebFrame::scrollToAnchor()
    introduced in QT 4.7 that implements the functionality needed.
    
    BUG: 333619
    REVIEW: 117642

commit 75d6e001010e80b2db9d0f93a4e59e493a094c6b
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 08:58:50 2014 +0200

    Start to implement dialog to select element that we can't merge. We need to select one info in all selected contacts

commit 2a96eeb30a3b4390279ac172dc5539cbbe612a34
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 08:44:38 2014 +0200

    improve merge contact

commit ef6f1568c17a14b52caa032687593329fc86887e
Merge: 87ec343 57bc4fd
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 07:28:51 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 57bc4fd41a27fdb41150ff88ab208d7aee4704b2
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 07:27:55 2014 +0200

    Initialize variable

commit 0263e9a9166ca2285bd49a93ba9d699db2ae81e2
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 20 07:20:46 2014 +0200

    Remove unused variable. Initialize variable

commit 87ec3430d85b3e372239ed520188304642c966c0
Merge: 3f1e7fe b80fe38
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:38:59 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b80fe3855431b798f63f7429b1adffdf7136f9e6
Merge: 71638ce d51044f
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:38:02 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13
    
    Conflicts:
    	CMakeLists.txt

commit d51044f334aee57ac678334566c47ee9b1b5a540
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:34:03 2014 +0200

    prepare 4.12.5

commit 71638ce0fd6ebe87d167444fbf4e2ab6f1659564
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:31:19 2014 +0200

    initialize variable. Remove unused variable

commit 3f1e7fe139a7af17aa6134984bac7548e390106c
Merge: ffaab7d eb73fa1
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:09:18 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ffaab7da9079638b30dd9f3927d8e213fa66ca51
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:09:00 2014 +0200

    Remove not used pointer

commit eb73fa1a8ee77f3c69d9fff31d2266bb67c8d227
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 15:07:22 2014 +0200

    Not used

commit 764830947dea1bcc8f1cba0e4e373271451be209
Merge: 9a66a20 6bc1707
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 12:26:36 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	pimactivity/configureactivitywidget.cpp

commit 6bc17072cff70509bb2db3f64b8de6daff1c4de1
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 12:19:19 2014 +0200

    Update files

commit e6ebd9b593dfd366b8c57932cc3167a8a3ec5b3b
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 12:15:04 2014 +0200

    pimactivity will not implement before kf5 and I will develop it directly in kf5 directly

commit 9fed45112711cf203a03ba3b3ed5ca0ee796c836
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 12:13:39 2014 +0200

    I will not have time to implement it until KF5 => remove it. It will merge in sonnet in kf5

commit 6fd3bec999573b6746518d131ffd6f1ffafa9011
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 11:08:31 2014 +0200

    Warning --

commit 9a66a20ef4f36db2841d183f78ae7cc19f9e16c0
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 09:48:39 2014 +0200

    Show result

commit 74bd303bc2559a292bc44ce8f4b98029bbd11174
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 09:39:48 2014 +0200

    Implement all unittest for mergecontactshowresultdialog

commit 8fea9b56424c35bea73dd9edead4b94bbfbc518b
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 19 09:33:39 2014 +0200

    Fix unitest

commit e1f9215962c6df0140ed771bc7fe9dad1a77d03c
Merge: 7a6d805 aa70c83
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 21:08:07 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7a6d80572f7cb9e60b3a6a89f850851cb2e84fd4
Merge: 0ff9aa9 d33ce56
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 21:07:55 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit 0ff9aa90d834898f310e29866a580f891ff20386
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 21:07:33 2014 +0200

    improve mergecontactshowresultdialog

commit d33ce567340a9804bd412a214c09c122131ea6aa
Merge: 2cbd1c3 1b35d8f
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Apr 18 19:59:12 2014 +0100

    Merge commit '1b35d8f551d84c5ffc60f42ea35eba29a16631f4'

commit aa70c83e8bbdbe8951a18c23313916137dd22fd1
Merge: 37f3637 1b35d8f
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Apr 18 19:56:27 2014 +0100

    Merge commit '1b35d8f551d84c5ffc60f42ea35eba29a16631f4' into KDE/4.13

commit 1b35d8f551d84c5ffc60f42ea35eba29a16631f4
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Apr 18 19:50:30 2014 +0100

    Fix wrong startup message about no writable active alarm calendar
    
    The erroneous message was displayed too soon when default calendar
    collections had to be created. The message is now displayed only
    after any calendar migration has finished and any new collections
    created.

commit 37f3637e9c8fbea5f23d245d77b58b35da88bb41
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 19:36:22 2014 +0200

    Bug 333583 - Quick filter button ('More') is not (re)movable
    
    FIXED-IN: 4.13.1
    BUG: 333583

commit 2cbd1c35a1f69b06bed4e5dbc0dc695eb317cba7
Merge: d8aefa4 3b42d18
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 14:00:30 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit d8aefa4757228c7585a819ca1fefef60bff8b133
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:59:56 2014 +0200

    Start to implement result dialog

commit 3b42d18ff934680b798ac55db87efeebf12eae32
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:34:16 2014 +0200

    Disable/enable append signature

commit 91c24d72e11667ed923270b95656ded31bf21d83
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:33:52 2014 +0200

    Move to own directory

commit f42e3f798256ad63fbbf5ef088b40438a2a8843d
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:33:22 2014 +0200

    Add info when we can't merge contact.

commit e2ce17baadaf407fa0004733e8445dcea560c420
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:20:57 2014 +0200

    Disable qrcode

commit 97c4fdd2c3e6897625a11a3b3cf395fb9770f191
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 13:19:13 2014 +0200

    Fix indent

commit c7a8fa074b2c5a1bbe51c75e38ab29ad83497287
Merge: db4c4cc 3e2768b
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 09:39:06 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 3e2768ba5a6a054a403bb78922bd5636e6d809af
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 09:18:44 2014 +0200

    Restore tab on correct order

commit db4c4ccce6277d30474d4cd9e49fbda1ec6c5521
Merge: d820a4e 201e755
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 09:02:17 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 201e75521e22bd110fb3f554247fc3097552c978
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 08:55:20 2014 +0200

    Don't show help menu in templateeditdialog

commit 1376bd7afdd4767a198dcc75cfe6e2c768fe29bf
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 08:51:49 2014 +0200

    Add clear button

commit d820a4edc7e9efce0a0a91df27052810207afba2
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 08:24:36 2014 +0200

    Generate new contact

commit 41ff5931b87bddd2ecfed0a9c4e97b818e4901b6
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 18 07:44:54 2014 +0200

    create a mergecontactwidgetlist

commit bf77dcfd772906414367d260070fcfb35514d434
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:39:05 2014 +0200

    Emit finish here too

commit e0ef1b6339c603dc5fab8e38a633a2dfab7366f1
Merge: feb88ef 60014ed
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:35:22 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit feb88ef9b04e453ad051f4ccd9748803a584567e
Merge: c7a2ed4 8914958
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:35:20 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit c7a2ed4c402e3a66c4ac46c88d34f9b8915bcc65
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:34:46 2014 +0200

    Cleanup. Improve merge contact

commit 6544ab7b93c8474d6c8546c43337ced7fd04478c
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:29:23 2014 +0200

    Show error when necessary

commit 60014ed2e7de1edfe8040dfd8603d4e776ede2b8
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 21:24:37 2014 +0200

    Fix remove storage service

commit 4a9c0580770a3bb69d522066103818b7e47699b3
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 20:45:33 2014 +0200

    Minor fix

commit 74447e64a722d6dd5a67be6dc361926f20c28f16
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 20:03:56 2014 +0200

    Forgot to remove this function

commit 89149580210d1434b8e704110c3cd86affdba8ce
Merge: d732596 5569463
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Thu Apr 17 18:14:09 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5569463c7b0e70fbe8cd2289b26cac6879b76f4c
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Thu Apr 17 18:12:28 2014 +0200

    really fixing Bug 329269

commit d732596d0c4329b7eac5b12dd8c1e2ec7d9d70bd
Merge: 2b21733 72af9b9
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 15:39:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 72af9b93accb76639100acb72d3de1faeae94168
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 15:38:38 2014 +0200

    Fix Bug 333534 - Creating aknotes plasmoid crashes kontact
    
    FIXED-IN: 4.13.1
    BUG: 333534

commit 2b21733aa79f609b2268f57dff1d387a363e17f9
Merge: 1a60426 5073836
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 14:01:34 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit 1a604268cc53de2c10d34970c97f6e22af635909
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 14:01:12 2014 +0200

    Allow to show short for quick focus search line

commit 5073836abd4636e771012d897bdae9dfcede3f75
Merge: b816d2b 9ff49c4
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Thu Apr 17 13:48:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c8ca96429f0a83b6c9bea3d2d096205dd8d97909
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 13:44:38 2014 +0200

    Implement merge contact job

commit 9ff49c4b16bdb4c111c9a08955105cd062433cae
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Sat Mar 29 14:47:30 2014 +0100

    Fix 329269: Inline OpenPGP uses decryptMessage.
    
    * Add tests
    
    BUG: 329269
    REVIEW: 117153
    FIXED-IN:: 4.13.1

commit 9ec607b3d41077cd9c65966d8aaf3feea3ff7124
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 13:34:29 2014 +0200

    Allow to disable show qrcode

commit 1480e69305ba1e24faefd31169c5df586a36d636
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 13:21:05 2014 +0200

    Use infowidget

commit b816d2b706c09dc854e9807fc52a4410a4ac447d
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 09:07:35 2014 +0200

    isolate akonadi unittest

commit 7b0964e6d0f8d6244a6c118fa62a220acb6de066
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 09:03:39 2014 +0200

    Add unittest

commit ea81b1eeea31b5de327e6ec5f371ee48dc407c37
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 08:40:55 2014 +0200

    Improve infowidget

commit f29eb8cec320e3ba205f9a4af23c698d38deddde
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 08:13:09 2014 +0200

    Start to implement contact info widget

commit 95d15306787731111c02f63ae792c46a70c9d06c
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 07:54:19 2014 +0200

    Continue to implement merge contact

commit 9984a0c70e8316c8c427cc7e46b9cf0873791ae7
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 17 07:46:05 2014 +0200

    Use setClickMessage

commit 0b1a24fc9c9d16d497227d6d60166359d1a3217a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 22:52:31 2014 +0200

    Merge when we select at least 2 items

commit 87afe3b9ba9553256d0c9388f54b452cd93849a6
Merge: a4bb085 2974119
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 22:45:13 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a4bb085e83aef2e0c2af7d167d6d4a809a1693d9
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 21:57:28 2014 +0200

    Continue to implement merge contact

commit 297411963d67d41b7d70df30e80179b4df4b4bb0
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 20:34:27 2014 +0200

    DEbug--

commit 93b57892220d5d88645d24f230bdb947ae3b665f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 20:00:41 2014 +0200

    Save settings when we use print preview

commit 99d0ec8dc688ee9836c180057d967454d6e94bb3
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 13:59:23 2014 +0200

    Use namespace

commit 8ab1e305ddcbc75d390ec677865515c91381efeb
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 13:51:44 2014 +0200

    Continue to implement mergecontact

commit 796331768d9c62520099c2437e8111405a02e715
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 09:40:58 2014 +0200

    improve contact widget

commit aef61176fea6fe942503aa8333dc8f2377dff6f5
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 09:25:55 2014 +0200

    Fill list contact

commit 8bdfb4beacbcba2af8bda6c9dad63279d11783ce
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 09:06:11 2014 +0200

    Enable/disable merge button

commit 579a0cfaa9219ddcc3a0c39e88d81153b09ff723
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 08:52:19 2014 +0200

    Add unittest

commit 01d05b747b3cb2cf1d9cd0b45c29f9cbb83975f4
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 08:24:21 2014 +0200

    It's time to implement merge contact

commit 1ad8b83fdf4fdf6f6adfeb342bb74aeec84f4abd
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 08:11:06 2014 +0200

    fix indent

commit a3563b2ab717ef504d9d6d594299bd8d9246d451
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 15 08:09:41 2014 +0200

    continue to implement createtaskjob

commit dcb6e86cdcb7082af5c60168ee2236a32658f6d6
Merge: 8f28a3f e906fbf
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 21:54:15 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8f28a3f1aa9a5820a1709f7b0eac0efbf703fc2c
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 21:53:46 2014 +0200

    Add shortcut to show search bar focus

commit 8081194e3e388eaea84d6a5ec7085d0bd26159ca
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 21:53:29 2014 +0200

    Add message when we don't find addressbook

commit e906fbf828c389906187e07e6dae210101017200
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 21:48:31 2014 +0200

    Fix indent

commit f94ef7be872d0f81f2360ecded10ff6cefa85bb6
Merge: db6d4a6 c47dc2d
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 13:57:19 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c47dc2dbb02f3aaa63d3b0ab883a877184d9ab26
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 13:54:18 2014 +0200

    Fix crash in kontact when kmail is not started

commit 40fdf78212d8e94bad08b2ba614c516fcf957c69
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 13:40:26 2014 +0200

    Clean up code

commit dbe946bee2a0717113f0f3cb3597eba9f5f2bc65
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 14 07:58:50 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit db6d4a624e45ad1be92eaab99c5c1cbd5aac5cd2
Merge: 8f7cbfa 4c01edd
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 08:50:01 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4c01edd584809530382c5e7f0eff488731431ced
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 08:24:14 2014 +0200

    Fix update list of theme when we install/remove theme
    
    CCMAIL: grote at kolabsys.com

commit d56f7f6a57956a7eb8720807a5e363ab5db75e9d
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 07:59:56 2014 +0200

    Move config (account order) to kcfg

commit 8f7cbfac593a0f38b7a77320df55ed0e056f65b0
Merge: d6d2d39 ff9b512
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 07:45:15 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ff9b5127459e549847871aafe9d296e0333527bd
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 07:43:23 2014 +0200

    Fix crash in kontact when kmail was not activate and we activate it

commit f2d52990820c2e394653c3689309d4af431dcc8c
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 14 07:20:56 2014 +0200

    Fix Bug 333391 - Configuring Kontact causes it to crash
    
    FIXED-IN: 4.13.1
    BUG: 333391

commit d6d2d39248a52f6595e5ee817079f23d23464d76
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 14 04:58:20 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit f20d00a2d3d73b1918f5b1240b4405a22c1587ea
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 13 08:23:32 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit db1d66bcc85e269d0a68c8c18fa8d72a428260af
Merge: 8fd7797 3b16fda
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 13 09:57:11 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 3b16fdaf9a0a73dc5538ed6731e9f67a4c94347f
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 13 09:38:09 2014 +0200

    Don't create empty template

commit 8fd7797ec108391a6abadf0d916600c7ad7c111c
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 13 05:15:18 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 31b0e23610c2311f437769a42e9576218c8f9cfb
Merge: 461158e 0848921
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 14:12:22 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
    	agents/followupreminderagent/followupreminder.desktop

commit 0848921b8ef4b192d23379a2aba2848664d36dec
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 13:48:18 2014 +0200

    Remove it not implemented

commit 461158e56d20412600731ac645521b918d815784
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 11:41:54 2014 +0200

    a instance broken is broken not necessary to see info about offline/online

commit 01afd3959f980192a3a4116250e9ea11fb4a651b
Merge: 0db6c69 f804f70
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 10:33:15 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0db6c698ca76bd99828ebc73476798bb58e50218
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 10:33:00 2014 +0200

    Fix potential crash

commit f804f706cc889fa0e151041445da2f383b0d038a
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 10:32:04 2014 +0200

    Fix potential crash

commit f9bb39652cfbc1b03e52e848138e78be3560cd4d
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 10:23:08 2014 +0200

    namespace to mailcommon.

commit 97115e8cf27790332604bb8b1c08e4adf0ab3ea8
Merge: f9a4e51 24010db
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 08:55:43 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 24010db7d83e1174d2e44bc6590c610ef86508df
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 08:55:13 2014 +0200

    Fix enable/disable ok button

commit f9a4e519bc491ebb30891feb186b52961a856419
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 08:34:57 2014 +0200

    Move enum in private class

commit 1b78bd1d3b7aee2c423e43a9ed5d179df52fc90e
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 12 08:27:46 2014 +0200

    Use QFormLayout

commit ada87e4ed881936139e031b19f21596ca627a9fa
Merge: abeff04 8315c82
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 22:38:37 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8315c8253adf5b733f7830a735e7bd6a8680538b
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 22:33:33 2014 +0200

    Be sure to disable Save button when it's not a real archive

commit 991aaf4540258529e74194d6a1e9e717797bc06f
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 22:28:09 2014 +0200

    Use a QFormLayout

commit 990f720465921d4d7cab52ae00b6d36a3bf36eb3
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 22:21:02 2014 +0200

    Fix potential crash

commit 61cadd624aa3606abe551fdf5bb3cade0306b36f
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 19:45:01 2014 +0200

    Fix Bug 333328 - Knotes crashes after start
    
    FIXED-IN: 4.13.1
    BUG: 333328

commit abeff0439cca083a43f4512a00661a88d36a3e51
Merge: 6933264 bf59403
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 14:00:08 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit bf594035fdced7aaf6e0bb826e0e1dd1afea673e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 13:29:08 2014 +0200

    Add minimum date/time

commit 2085e2b6866c7a3312fabb9d737480662e41a30c
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 13:19:53 2014 +0200

    Remove debug

commit 984f991524b718fc28fccb9e4b51f07601f4eae7
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 08:31:09 2014 +0200

    Fix indent

commit 1a6e3bbcc1a471a1aadb324243bf4821327ec656
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Apr 11 08:58:10 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 69332644b78ba53e36a91e553287fdd3f7f50b38
Merge: a02738c 5465525
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 09:46:28 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a02738caf84569dc6d8c7d0a7bc211a73dad36b8
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 09:26:33 2014 +0200

    Need taskattribute for the future

commit 77aa686469e32d6fa602a340f49738f8df5e187b
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 08:33:14 2014 +0200

    Fix forward declaration

commit 60257350a948df458c6475e8cb4e49f91b0b55eb
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 08:16:46 2014 +0200

    Add "Imported from" as note

commit 54655255edaee63a66c23d9d44ca4f7e4415cbbc
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 07:53:09 2014 +0200

    It's an integer

commit 596827145fb513e74b39b8e7c07061cc91ef1945
Merge: 3ec86f4 9c86a05
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 11 07:41:29 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 3ec86f4439ce96d9ad987a59cf7554a832c47f1f
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Apr 11 05:26:45 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 9c86a057647d7a204ea4827f3fe21aca7295f3c8
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 20:31:45 2014 +0200

    Update info

commit f04f0ba295bc0a5f37b912039ce09cdc1c5ea9c3
Merge: b2d3d74 d391ff4
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 20:11:22 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b2d3d7403556605b24c4eace4d4171857808ae88
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 20:10:51 2014 +0200

    Move to own directory

commit a73c8a28c2b8167fdbb6d23af474fc87b1ac04ae
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 20:08:35 2014 +0200

    Remove old qt patch

commit d391ff4b27f6381af13f7f4a441491e2558e095f
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 20:03:54 2014 +0200

    Fix reset to default theme.

commit 10cb902c60dda05e5389a8b1845f5e9f5ff482c2
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 19:53:26 2014 +0200

    Print long date

commit dcfa690d3deae933424363b962517cbd9eea956a
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 19:50:47 2014 +0200

    Update dox

commit 62f6a642d05f93518461c80130e21717354c2468
Merge: 928d0b0 043f5cd
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 13:59:44 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 928d0b04b6de44aa7ca777f5c22c6fc619995eec
Merge: eb5491b ae9a91f
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 09:42:30 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit eb5491baa5de92dca0eab6b117b48b9cd3e34022
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 09:14:23 2014 +0200

    Store error info too

commit be5d3bfdfb456101810e80c14c56b7e0b036c09a
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 09:03:53 2014 +0200

    Inform when we can't save message

commit 62b44b0677b9d68559ea5b6d13cad6572cad331f
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 10 08:01:17 2014 +0200

    Fix coding style

commit 60cf1d945e9b265fb34c059af5d5f0cd4efe5eef
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 10 05:08:52 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 5e4416179dfcd2706ea778b627f0e69d2a942664
Merge: b0ffc85 2cdf26f
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 19:00:13 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b0ffc855d7465af93dce0cd2c4038fbee874486b
Merge: b0da730 0264137
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 14:00:58 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b0da730d1371f544fb3407ca6b666448837995f4
Merge: fa98a54 3c55500
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 09:37:49 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit fa98a54ba09fa41856380e2df61d103d5d7c0c2a
Merge: 241d9e5 6f2ff99
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 09:27:08 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 241d9e5a10bc0de49b4a29ff5cf18e797dc5cedc
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 08:38:52 2014 +0200

    Move grantlee editor in grantleeeditor directory

commit d56ec943776cc177419e193fb1e93a140070291a
Merge: 17d962c 8f185a5
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 9 08:31:21 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 17d962caaca56cc6cb874876f0c89a9e10085da9
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 9 04:56:53 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 3ed255091f7b9b6099a1da2dba04fed4b9910d69
Merge: 4c630fd 2a996ec
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 23:27:42 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4c630fdd4c10ed1c8e83312a6ffb8cf097692545
Merge: fd178ef 6b0fdd2
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 13:59:16 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	agents/notesagent/notesagent.desktop

commit fd178efec9a1eae5e245a5f39d2c9edb500daa3e
Merge: 832266a 30c6097
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 09:49:10 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	sieveeditor/sieveeditorpagewidget.cpp

commit 832266af4ee90552c474c33fbed38dadde4354d0
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 09:45:42 2014 +0200

    Print address when it's not empty

commit 835a0450b7b2bd3928a666a7d7dbe804978f22f6
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 08:59:39 2014 +0200

    Remove check

commit 1f6717d2c887446a2ae63e05b9846b55b5aa77d2
Merge: 186fff6 5966f81
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 08:47:59 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 186fff606ccb59e34730dcf3edbba5ea510ddce7
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Apr 8 06:19:12 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 918c7a8dd3cc1efd845bd5f7b641ce64caab18c8
Merge: 2f14a99 524aff5
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 07:47:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2f14a99d2b4aa74c86d341928872ec033b3827b8
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 07:39:59 2014 +0200

    Fix i18n

commit 14c230a9b276963d830eecf86856e8ef3bf82498
Merge: f33860c 4cc560f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 07:39:21 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f33860c231d1ee430efccbc285e60406a964f486
Merge: cc1e372 cd7cded
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 07:28:10 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit cc1e37249f5c49756428c207a489529444e6b244
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 8 07:15:43 2014 +0200

    Allow to change type of note

commit e7ae25add069580a11d28d9e6dd0270310cfe375
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 22:52:08 2014 +0200

    Allow to specify type of note

commit 2e67c30ce865402284c245c0c86f01ae5279c635
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 21:13:25 2014 +0200

    Add layout

commit f91bbc3a4f6b736b72a185c9a3f05187b013cec4
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 21:09:12 2014 +0200

    Add messagebox before to remove recent address

commit 303feef513dc62490f7e505d0c38f644bb398833
Merge: c82dc08 397ce45
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 13:57:31 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c82dc0848ffab02342dc784a90d297f54ac2e8d7
Merge: 9e63e33 6e01961
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 09:44:37 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 9e63e337be8a9bbbf2a0932cb545626f7ced0d75
Merge: 7f9bd1d 0ff5c41
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:54:49 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kaddressbook/printing/grantlee/contactgrantleeprintaddressobject.cpp

commit 7f9bd1d7ccd0f0ebf6a7d9c2ed40ae41814d5817
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:54:17 2014 +0200

    Fix show address as html format

commit e7871337d33b489489703b8b5a6160762fa69636
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:48:02 2014 +0200

    Fix print address

commit c9a603b9fef4d7eb6591de8414d05c836015ca42
Merge: 80d3bb9 04da12a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:43:46 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 80d3bb95687611116e4e0ca70577068380a15d23
Merge: c8836e8 4a8b53c
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:13:48 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c8836e8c7819572907b6cdb96d2d916da0182881
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:08:02 2014 +0200

    Fix coding style

commit e746dcb6c686b74d58c67941741b5208381bfd8a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 08:05:08 2014 +0200

    Remove old TODO

commit 3db984e8d8e68e60085664caba1a18d36d2a90a3
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 07:58:39 2014 +0200

    Move to own directory

commit 2e8f8bfc3a397b1e7598bd0b5d9836b80138fb0d
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 07:49:50 2014 +0200

    Stop timer when we close it

commit 2272a41024587a10030d64630c8a1bc5b4062206
Author: Montel Laurent <montel at kde.org>
Date:   Mon Apr 7 07:44:20 2014 +0200

    Not necessary to use a kaction

commit ff2c67200d4f3ea988c8971b730f1b0b21feb1c4
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 7 04:52:40 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 7ce1b7b0cbe96cd628d2f77c74287167e2d12216
Author: Luigi Toscano <luigi.toscano at tiscali.it>
Date:   Sun Apr 6 15:59:59 2014 +0200

    Fix messages (more clear, common conventions)

commit 3d75c6bf3856138a755461ab67acfacddb436065
Merge: 93d04b0 1946e77
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 14:28:14 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 93d04b07270460b50027066c8bef8e059b099835
Merge: 5fa650b 646b47a
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 13:03:53 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5fa650b67b81f58abfa194940c644ce784e98b2a
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 12:43:38 2014 +0200

    Fix Bug 297138 - When saving an attached file from a mail, give the user the ability to either open it or open the folder where it has been saved
    
    FIXED-IN: 4.14
    BUG: 297138

commit d61334243fd268048d55d50285ae9a7af12c36fe
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 12:05:06 2014 +0200

    Show folder widget

commit db8f6ba52595aaed7aa01e311ba501a952fca9d2
Merge: 460bf70 9bccf48
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 11:23:42 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 460bf70bd24a7ebd1be9290d771b8283f6953bf9
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 09:14:11 2014 +0200

    Launch url

commit bbc7642a1ef2d0565a120cf474034618604d1df9
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 09:10:33 2014 +0200

    Start to implement Bug 297138 - When saving an attached file from a mail, give the user the ability to either open it or open the folder where it has been saved
    
    CCBUG: 297138

commit 9d428e2dfff996ec89e137d8279e9ddfa5ef0734
Merge: 1dc5a29 b481e09
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 08:12:58 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 1dc5a29cc5503b10d950182f2b10c29f8cc6eaa1
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 08:06:46 2014 +0200

    Move more code to mimeparttreeview

commit ade71024f31cbda653110f2e46d9b0b33851076e
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 07:53:52 2014 +0200

    Save settings

commit 9650a96bb60dbc33dc8ac07aa2b3ea944b1ee64c
Author: Montel Laurent <montel at kde.org>
Date:   Sun Apr 6 07:31:01 2014 +0200

    Allow to search in all column. Use case insensitive

commit 91f3fdc33c03422220ceb55d1ebe30233eb3141d
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 6 05:10:11 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 88e9f5da47dbcd654021ebebe4fc339460bb15c7
Merge: 2698d37 d88c9f4
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 5 11:56:58 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2698d377561a0278d08533e79a066bf19e0bcc40
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 5 10:29:20 2014 +0200

    Add a filter line on result

commit b97085ba756c55209efaea79dfd64952684bd909
Merge: ce097ab f866c6e
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 5 09:54:34 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ce097aba2027ea90bf6f72b1d4be083077702e16
Merge: f3219bf 34b73f0
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 5 09:47:42 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f3219bf0ff9b270f14190749e61db8c9c8932b4b
Author: Montel Laurent <montel at kde.org>
Date:   Sat Apr 5 09:45:05 2014 +0200

    Move code to mimeparttreeview

commit 30c3e05dda1fddba26c975647d510da96b5f44f1
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Apr 5 04:51:44 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit de30221c0ea0195605b3c05e28877e4d44de0066
Merge: e06e797 14ce96e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 21:34:53 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e06e797e6009b29b4c263ec534622f7b44eec8d8
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 21:34:23 2014 +0200

    Extract mimeparttree to own class

commit ebb82ce183d279f7517d4198d381de6c19fb1c2f
Merge: bb56e0f 1ff4a13
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 09:44:40 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit bb56e0f1fabc5a037b4ab724f838d91bd99d8820
Merge: 2e0f8f9 8a7dfb3
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 09:25:45 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kaddressbook/printing/grantlee/contactgrantleeprintobject.h

commit 2e0f8f953186dd3c61f822fd4e12885fe6943242
Merge: e9bb608 dfd7356
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 07:58:13 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e9bb6087f7d528f631869bed4c653a72a1e8823b
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Apr 4 05:26:48 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 8a5f1b8810f2ecf9444294b2e43b7b7d5a3145f0
Merge: 0762c96 3164627
Author: Montel Laurent <montel at kde.org>
Date:   Fri Apr 4 07:25:07 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0762c968518deefea98b3e3c64dbe475a1f216e5
Merge: dd75f52 ec5971a
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 23:04:02 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dd75f527037d79934d11d13eafe12603e2691781
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 21:15:34 2014 +0200

    Fix Bug 175441 - Option to hide crypto state indicators
    
    FIXED-IN: 4.14
    BUG: 175441

commit e6775d7556ff31e04dcfac2513176548bcc4b3ab
Merge: d130875 332b895
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 13:49:27 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit d1308755c096510815085d6555cca28c594795b4
Merge: 306e1c1 bcac946
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 13:39:31 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	knotes/data/knote_config_collection.desktop

commit 306e1c19a48de09b84e80387d797aa7c3ff2d125
Merge: ca53677 a063020
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 09:38:43 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ca536779c31bfde9a922b7a35a267bc1ed0ca9fb
Merge: 10ca207 42b8ad5
Author: Montel Laurent <montel at kde.org>
Date:   Thu Apr 3 08:50:01 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 10ca2070aaafcccde189d748b98ebd5dd6210e61
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 3 05:07:39 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 3cdecea4c329edae2a6fa391fd0ba7768bde185a
Merge: e185820 1a14bd9
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 22:42:10 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e185820e0e0570ad39946eee79115e53c89da893
Merge: b522ff4 cde0e42
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 13:49:43 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b522ff4ad745ab834f3756e7c6b5bbe5f849b269
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 13:48:50 2014 +0200

    Continue to implement html

commit 6d9485341a4f315b342c2a3de9dde5ae651163c2
Merge: e103502 85f1e6c
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 13:23:04 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e103502bc4649d3fc680020e67b7d272f10a039a
Merge: d9589d5 594f56a
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 09:22:27 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit d9589d5fcfb6abbd41cc77a416cdba40e2b84e41
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 08:37:47 2014 +0200

    Now we can display photo too :)

commit c9cdb84268a61a1483c19f6afd70db47dd962f55
Author: Montel Laurent <montel at kde.org>
Date:   Wed Apr 2 08:32:33 2014 +0200

    Fix theme

commit b50835d7a48f835552db2c9db32f5fb953ad42a2
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 2 04:56:53 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 2db2040a657a233d85de91bec0c4ff047ab925f0
Author: Sergio Martins <iamsergio at gmail.com>
Date:   Tue Apr 1 23:03:18 2014 +0100

    Make viewing invitations in KMail really fast if korg is running.
    
    If either korganizer or summary view are in memory, just reuse their
    ETM.

commit 0cd9d60702a508c44b9a8d03da639f1b7dd9534a
Author: Sergio Martins <iamsergio at gmail.com>
Date:   Tue Apr 1 22:53:02 2014 +0100

    Port away from IncidenceFetchJob.
    
    This class already exists in kdepimlibs as private, so lets not have
    duplicated code.

commit 84e2e8958cbc07a06bec75aa61669c59d7785276
Merge: 2118cbd 4148ef6
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 22:32:16 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kaddressbook/printing/grantlee/contactgrantleeprintobject.h

commit 2118cbd16cd220a759f7918b2cc2ac9e5a54bd18
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 22:30:28 2014 +0200

    Improve it

commit 1bdda54af203c2518a3b9fc8a55030986d4a48b5
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 13:54:42 2014 +0200

    Allow to show original folder
    
    CCBUG: 332616

commit e3778df2fb539befc1ae367317ba79aafed181ff
Merge: 8f8a646 27a7fc8
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 13:38:05 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8f8a64656e206b27a3715cfa798232be3b36c48f
Merge: 5bf0e7c bd6060f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 13:33:27 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5bf0e7c23dbc718ecf91d8b3ea50a8129f6d9fb8
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 13:32:48 2014 +0200

    Add default filename

commit 8c8cce0e38c6668080f48a5faef10409003d304e
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 09:48:11 2014 +0200

    Duplicate code--

commit 2185515bab7bd98fa6e1f10bf35bb37804d3203b
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 09:39:43 2014 +0200

    Avoid potential bug

commit d8130e5c7e9bfa149a60f13673278a5c4aa83f89
Merge: 2eced74 79dd61b
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 08:19:37 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2eced7457bef6f2d42bb76f0289abadc2d21e3d9
Author: Montel Laurent <montel at kde.org>
Date:   Tue Apr 1 08:17:26 2014 +0200

    improve printing support

commit 9f4f3d0871afb548469df15f8f7622450e29565d
Merge: 6667acf 19636e7
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 22:59:17 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6667acf41c017e7604ab616313857c341de555c1
Merge: cd6bde8 20ae928
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 22:59:16 2014 +0200

    Merge branch 'master' of git.kde.org:kdepim

commit cd6bde80db3bc8bac3548bf7ca97e746ffd3dff0
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 22:58:56 2014 +0200

    Fix i18n

commit 53fcc1c68dc67aa4eb544e62f74f9672d5d0fec2
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 22:58:40 2014 +0200

    improve default theme

commit cbbac96cdaa46c698f93285b30bcb3aad680468a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 22:58:25 2014 +0200

    Add new theme

commit 20ae92886db809913e83c6141874f0a517ac8bfd
Author: David Jarvie <djarvie at kde.org>
Date:   Mon Mar 31 14:03:02 2014 +0100

    Rationalise handling of error status and messages

commit 68625007ee8b35999aa4f9862978fb887cb86a15
Author: David Jarvie <djarvie at kde.org>
Date:   Mon Mar 31 13:59:23 2014 +0100

    Add destructor

commit 11958af0f7567277ff944047ad30a1c4fc130b20
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 13:58:24 2014 +0200

    Minor

commit efa527663bbe06448865bcbcfe925cda7522c630
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 13:53:45 2014 +0200

    improve default printing theme

commit 25e7f219b9a6308929c478839ef5bfee20a8946a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 13:23:50 2014 +0200

    Add info about crypto

commit abbac6a4f6fb8328f13f8ebd7c09420e380df04d
Merge: 5ddb078 89fa347
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 13:21:39 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5ddb078e42c484b3cd5389c84805c7d873a55119
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 13:19:24 2014 +0200

    Add crypto support for grantlee printing

commit 270376a17531f4552fab13fac7101fa5e5a0e8d5
Merge: 1490ee8 e891ca1
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Mon Mar 31 10:55:20 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 1490ee81b914ff569ffde6dd6880a4bf8d3c96d5
Merge: eab6088 a806567
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 09:45:42 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit eab6088781fbf7515b54160378509e5e512019f3
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 09:44:02 2014 +0200

    Activate job

commit 464ffd4f29077b0fdfff2a6c9ef89bde96a60a7c
Merge: 6d2a24a 2f3b1ef
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 09:11:43 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6d2a24a8687c4ca4c7623356b0454c032532b39b
Merge: 001bdfc b1062cc
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:46:30 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 001bdfc60646a43dfdac5a90c1f80102287d1d83
Merge: 400c269 814b6c7
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:43:06 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 400c269e9cd97c76c88a02fb0b85e5f30b9c62e9
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:29:53 2014 +0200

    Allow to close tab when we click on close button in tabwidget

commit 4855b93efbe7e0b694d97a4a8448fb998def2af2
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:26:35 2014 +0200

    Symplify code

commit 8f9b95f0008c97e8d3a75572ec05e1b202e86c9e
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:12:41 2014 +0200

    Add clear button

commit 213ad1a87da00c71fe3c6d03f63eeb2dc48c9c91
Merge: 29fb0a9 fa77bc6
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 08:00:51 2014 +0200

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	calendarsupport/calendarsingleton.cpp

commit 29fb0a9b67b9120cb1830017d640aa9c0055952a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 07:54:42 2014 +0200

    Add more i18n

commit 2ffe68d17bb26fb91fb18237d7a76266de0d203c
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 07:46:45 2014 +0200

    Clean up

commit c8476ab50b93839061a5c56e91787a37eaed3e85
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 31 07:23:14 2014 +0200

    increase dependancy

commit 77ab218133a246a577e4cdb385a6dbb9502e6407
Author: Sergio Martins <iamsergio at gmail.com>
Date:   Sun Mar 30 23:26:50 2014 +0100

    invitations: Don't load all events if we have them in memory.
    
    If you're using kontact, chances are you have events in memory
    already because you either opened korganizer pane or summary
    view since you started kontact. So reuse that.
    
    This is a stop-gap solution. Proper solution will involve baloo
    to search by Incidence::schedulingId() so we load only one incidence.
    
    This fix is for when you click [accept] on the invitation. There's
    still another load that happens when viewing the e-mail. Will use the
    same optimization for that too, next.
    
    CCMAIL: dvratil at redhat.com
    CCMAIL: chrigi_1 at fastmail.fm

commit c51bd44791be3f0869864de17293dd9fa86a4728
Author: Sergio Martins <iamsergio at gmail.com>
Date:   Sun Mar 30 21:11:10 2014 +0100

    Return a shared pointer so the API in kdepimlibs can receive it.
    
    Will make the ITIPHandler use korganizer's ETM so we save memory
    and CPU each time we open an invitation.

commit eea4d2bb92157c365c25c627b24159dc30931af2
Merge: 8678ebd 59820ee
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Sat Mar 29 20:28:08 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8678ebdba0ab67cb74c1bb51161915867b509df1
Merge: a640a5c 4e9f8a9
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 29 17:01:35 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a640a5c114292510e8f70e7cb0aad89936f021d4
Merge: fbdc4af a42ba39
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 29 16:32:40 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit fbdc4af78b7570bd0b364426a16788ba26c83bc6
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 29 13:36:38 2014 +0100

    Reorder

commit 0160364fb9454ccbd1da8a8ffe74257fd882fcec
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 29 13:28:39 2014 +0100

    Cleanup

commit a806529418bb557c5519436968ad1555d3c11cd2
Merge: ca2fe45 3319081
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 29 09:58:16 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ca2fe4567ba357a0ec2bae7d7118804880b12aec
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 18:11:58 2014 +0100

    Allow to restore default domain name

commit 859965bd8fa792909853e40070d4e76bab58e5ab
Merge: c7fa50c 0c8802d
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 17:57:26 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c7fa50c9e9327357c09e050891f6adeafdeb2248
Merge: 096bb19 9b764bf
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 17:27:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 096bb19d98d7fe583b37705847fd65cd33473ce8
Merge: ba8d5f2 aa53c1e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 17:07:55 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ba8d5f25483fe26a8ce2ddd2780bb8e8b29f6d7a
Merge: 77a45ae 7c02f5f
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 10:48:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 77a45ae2d231bbda4963d3cdfade05f67a1fb075
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 10:47:06 2014 +0100

    Fix Bug 146510 - Per-identity default domain (or per-transport)
    
    FIXED-IN: 4.14
    BUG: 146510

commit a435471d83f3a164e05e08f6921b18354b49dd4c
Merge: 5475185 38081ca
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 28 09:14:45 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5475185d7d161e3be41c0c20693cb05b499e5603
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 22:07:22 2014 +0100

    Order

commit 6da07607a25d1ff279f1db000ce6a847b575f75d
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 21:28:30 2014 +0100

    Reorganize CMakeLists.txt

commit b1edb77ca4310338c05fc85b44c7d6129be58b52
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 21:24:57 2014 +0100

    Reorganize CMakeLists.txt

commit c1237b4f42244ddad04ab886d5d4af119c7994fe
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 21:04:58 2014 +0100

    Move code to cpp file

commit 05a2324db978d5e96087a16b6aa981c591bb6edd
Merge: f232f48 f485b34
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 18:03:47 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f232f48aa4453cb85441590162e39ee562bf214b
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 17:41:50 2014 +0100

    Start to move domain name to identity

commit dacf4f23c8a327304d902647ea124b0d63c0f1a6
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 17:40:55 2014 +0100

    Make async save contact crypto pref

commit 6a6e69a7f583c017789f380fb88b7e69acdfd13b
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 27 15:31:41 2014 +0100

    Use correct unit

commit dc3de3b9f0b3d29a3b734480247f0e13831c2da6
Merge: f484b2c 93ed8e6
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 26 08:26:50 2014 +0100

    Merge branch 'KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit f484b2c90cbdce8288443599943183cbedad3dd5
Merge: baf3205 d6fddac
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 26 09:11:31 2014 +0100

    Merge branch 'KDE/4.13'

commit baf3205ceca989b0ffbc7ad198488a5e7d4e3a58
Merge: 40592a9 556e646
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:24:52 2014 +0100

    Merge branch 'KDE/4.13'
    
    Conflicts:
    	sieveeditor/sieveeditormainwindow.cpp

commit 40592a90d4405645652a4f6a979e4512df9018d7
Merge: 9325f12 360a87f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:16:19 2014 +0100

    Merge branch 'KDE/4.13'
    
    Conflicts:
    	sieveeditor/sieveeditormainwindow.cpp

commit 9325f122aacb5fab5d100e6e05aa3bd3db75ce13
Merge: bfde3b4 53ab828
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:12:17 2014 +0100

    Merge branch 'master' of git.kde.org:kdepim

commit bfde3b475ccab525f55b60bbf544d15c5cc48874
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:03:59 2014 +0100

    Disable/enable refreshall action

commit bd9ca3d092bceaca456066c1a6465fa6e1135624
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:02:28 2014 +0100

    Fix i18n

commit 5dcb1609c58cda4358ddbe1e9e3beb98b61c2c89
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 25 09:01:23 2014 +0100

    Add job to create new task (for the future)

commit 53ab8288b243aaae5378a5c910bfd4caf09c2a92
Author: David Jarvie <djarvie at kde.org>
Date:   Mon Mar 24 22:20:43 2014 +0000

    Constify variables

commit 727f19962d4434ad8b4b8d949c04479a3ccc0892
Merge: 342d671 ced796f
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 16:27:42 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 342d6716ff1e60adb34f84cfc1754cd5f40ccd27
Merge: 25c8f84 24c78b4
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 16:25:42 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 25c8f8495d29606394e1b65ff3e8ec6baef6cffa
Merge: b329d8f 4fc0e62
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 12:26:11 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b329d8f54736b7adad3790a80ea6a579ae1e9773
Merge: 57605bd d731ea7
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 11:04:45 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 57605bd14ceae1ae2d674e391f7bd87f238fa67b
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 10:58:55 2014 +0100

    Allow to use keyboard to change

commit 605f7237cc0d605f29f0e4055f9ca5eac31c6acf
Merge: 15d1735 52719e7
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 10:44:54 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 15d1735ee4314b27bbaaa636a3d4eed7f85dd4a3
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 23 10:02:57 2014 +0100

    Fix spacing

commit 49fb1da2178bc977b15c1afa761b91389ac64875
Merge: 75a0f69 5792205
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 22 13:55:07 2014 +0100

    Merge branch 'KDE/4.13'

commit 75a0f69f889c09d8aed234c2768dc78a5bfa118f
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 22 11:38:54 2014 +0100

    Fix warning about redefine signal

commit 8c328cfe9d5ab405f450e27239c1dab5e62de157
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 22 11:17:20 2014 +0100

    Minor optimization

commit 6747775c7990741d54d36c21084e14e72ab17e1d
Merge: a1f4675 16e1aec
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 22 08:24:46 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a1f467583af931b07e0e40d898d90229a11f3f09
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Mar 21 12:17:33 2014 +0000

    Fix build error against KDE < 4.12.4

commit 8ed4f267a6a22ffca5a0563f56803b40db4db5e2
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Mar 21 11:59:54 2014 +0000

    Fix deletion of alarms copied to KOrganizer not working
    
    This improves on the earlier fix by using GIDs instead of remote IDs.
    It requires kdepim-runtime 7aa85ce9b5f7d7274927d47381c40add2ce93fef.

commit 71ba320be5973738b387e924319d5a1384b30317
Author: David Jarvie <djarvie at kde.org>
Date:   Wed Mar 19 19:45:35 2014 +0000

    Ensure kdepimlibs version for deleting alarm from KOrganizer

commit 9d380aa952a427ea786759db7b6c7a0727c971fd
Merge: 2a58c15 aaa3ecb
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 13:16:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2a58c150317550b4e7fb7d7ecee1df080fc576a2
Merge: a84eca2 4f2bea4
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 12:26:24 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a84eca2e318bae46ba205c6f9cf1a3147ac6d81a
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 12:26:03 2014 +0100

    Add lab

commit 45b30e9b8948db9b3e1d4c61c4a372521b8a9560
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 10:10:23 2014 +0100

    Add mailmerge test gui app

commit 33d47e45a782c4715e4e217d4be3ebb04781102f
Merge: abffb21 cb839ba
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 10:04:10 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit abffb21d9cb6a905596f7549647388bb00cb6343
Merge: 7995fd5 b5b8c4e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 21 07:22:55 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7995fd57921d15530ea83702f8aef338f0662af5
Merge: ef973a9 9c13d14
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 19:45:24 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ef973a9ba25e0d67fc5dc5cbc37bbe39844431ea
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 13:20:48 2014 +0100

    Add new printing theme

commit 9dbccda9107ba4558900e9e90f23062122c5a186
Merge: 017c954 0fe2385
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 09:42:44 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 017c9541b176b859d1393b924a8716130ecdb7dc
Merge: c517e0c 023b571
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:43:15 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c517e0c827353e3ec4cda8accebc2e2cb0800ecb
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:29:26 2014 +0100

    Clean up constructor

commit 3b7f9bde64393dab85bd14ad2a8db6cd0bb316bb
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:28:04 2014 +0100

    Add new info about kdepim 4.14

commit 555c22ab8f4e5f9a1052c6ce1d7ff9ed8cc0559e
Merge: b8b2fcb 9c95e62
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:26:25 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b8b2fcbf0707a43e0fe7a70644ef843b1758e081
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:20:27 2014 +0100

    Add "note_is_locked_i18n"

commit dc02db7fd46f36d59d4ce42f43c77ab9b568facd
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:14:25 2014 +0100

    Allow to print alarm info

commit 28e3e4a551151fdc8fad9c59227910df14348123
Merge: 3369d4a 3e85aee
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 20 08:09:12 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 3369d4ae664b3916fc896379c6af0e89776ba003
Merge: 6c5d218 8b85bc8
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 19 19:54:02 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6c5d2188d37eb8908e55ef67347d894af1adccd5
Merge: d273f87 6348e04
Author: David Jarvie <djarvie at kde.org>
Date:   Wed Mar 19 13:41:00 2014 +0000

    Merge branch 'KDE/4.13'

commit d273f87800cf026fb7348d595537cb05c0c4d20f
Merge: 16b142f c506d39
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 19 08:33:18 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 16b142f5265851a4c22ced7427122933bce07134
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 19 08:07:38 2014 +0100

    Add new line

commit 2a0fffdbd96fb1f4d59d5ae393fc411813fa9764
Merge: 670f099 4ec3ebe
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 19 08:03:13 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 670f099d7340ec800171e14930193e4cf784e32e
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 19 07:50:03 2014 +0100

    insert checkmark

commit 9ee223010f8f4065ac3f4a239a85efadad28c76c
Merge: 5d66d51 983e07f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 23:12:49 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5d66d510a61e874e6c2fdc93c6a4f2aeec66cc7e
Merge: df08bf9 468542a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 13:59:00 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit df08bf9e0d38eb45846971879e1ac6ca96a16128
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 13:58:02 2014 +0100

    Add url requester

commit 68c7cc2768232f2ce92d0585f366fdcb8b9b91d2
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 13:53:39 2014 +0100

    Add unittest

commit e6a27d360f59a3fec6579471bd881877b6a29eba
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 13:50:04 2014 +0100

    Allow to apply default value

commit 58a30c1196b1ea41189515b37784949d61aed885
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 09:31:42 2014 +0100

    Use AttachmentListWidget

commit ef59b44ebfdfa9479fa163162ca36226c24375fc
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 09:17:08 2014 +0100

    Implement attachmentlistwidget

commit a8f6422d20e8d12265810161799c480e5fd0d485
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 08:36:17 2014 +0100

    Allow to customize add/modify item

commit c0c74096e2bada8d42940e59316fd6692ba4d5cd
Merge: 68983a3 022ec37
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 08:02:05 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	sieveeditor/sieveeditorpagewidget.cpp

commit 68983a33ec03d2316e1d3bb6d619deee048e5466
Merge: dfbcd7d 489acd3
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 18 07:31:04 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dfbcd7d1ffc876715419b0a06a6b013bf7d7d756
Merge: f1d6ef5 55055f7
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 23:34:29 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit f1d6ef55694076e6796f99f2e87c7b31a8d40d79
Merge: ac50bf1 004f0f4
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 23:34:05 2014 +0100

    Merge branch 'master' of git.kde.org:kdepim

commit ac50bf14e5808d29e72c96ac84bce7335f369ff3
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 23:33:51 2014 +0100

    improve mailmerge

commit 004f0f447f343e6af00ca255398693c3921d53fa
Author: David Jarvie <djarvie at kde.org>
Date:   Mon Mar 17 16:50:33 2014 +0000

    Constify variables

commit b5364c5e88ce9ad09cb2b538792c9c4109d60eb4
Merge: fb295cf ec714ea
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 13:57:16 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit fb295cf4b87b62cc5dca21782cc4388e70aa5193
Merge: 4b946d9 39feb0a
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 13:57:15 2014 +0100

    Merge branch 'master' of git.kde.org:kdepim

commit 39feb0a333f934b577c289f42c928a78c42194de
Merge: 58f465c 3e24364
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Mon Mar 17 13:44:48 2014 +0100

    Merge branch '4.13'

commit 4b946d93509a2603d6b71c8b019565ede913a64f
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 13:44:45 2014 +0100

    Continue to implement mailmerge

commit 5f85e43bae0dd5117666168308f4c1748b91d907
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 13:29:29 2014 +0100

    Add messagebox when we didn't select a filter to convert

commit 7c163e9f6c6ea6d3a5643477722fe5c50523a07b
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 13:27:06 2014 +0100

    Select all text in spinbox

commit 58f465cd3db6c96a6ca78c31138a57db129cb4ed
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 09:24:13 2014 +0100

    Activate compile

commit ad198f83056e0de5050414ec25d92a56dfa4da10
Merge: a7bf2f7 8ef5180
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 08:37:23 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a7bf2f77ca4887c2d046ef8b0ccc551410d2b2e5
Merge: 7465853 54929e5
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 17 07:14:06 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7465853532dda8f5d8d2e3830eb785fe61d17077
Merge: f228157 266a09f
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 15:26:15 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f22815753a0d8b5fd269750132a5e95ab0464a79
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 15:01:57 2014 +0100

    Clean up lib

commit 841c2c27b4dc4a73d327792f20d4ad77d91c51fc
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 14:59:35 2014 +0100

    Start to implement mailmerge support

commit 156f41aef9ee2276affe1239d66181b2f10a8912
Author: Burkhard Lück <lueck at hube-lueck.de>
Date:   Sun Mar 16 12:35:05 2014 +0100

    fix wrong shortcut for 'Create New Tab' action

commit e09f8835cf1310fd944ee371004d973a8313e99d
Merge: bf96b4f 7c9b8eb
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 11:26:36 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit bf96b4f4df7f076baa1008b132a83778a18eed29
Merge: c41ed03 7bafb63
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 09:32:18 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c41ed03bf23b10e8fbefb36abb5411f16f0e3805
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 09:30:14 2014 +0100

    Fix signal

commit 72f1d8c6b7e8a8392c973bf3ab94a907860634d9
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 08:39:13 2014 +0100

    Rename variable

commit a16c56e415b7c533fd0e876da9bb8a459d110a04
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 08:37:52 2014 +0100

    Add focus to lineedit

commit 02d6d44fba4d36237aed6d36b5b740a7f0852670
Merge: 4899011 50dbb79
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 08:33:20 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4899011ec5893afef94e355ba0433bcfbd546a1a
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 08:14:09 2014 +0100

    Set focus to lineedit when we click on go to line

commit b33146f244ac0c841497209cfdd25df6e04b9d25
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 16 08:07:16 2014 +0100

    Update "gotoline" action when we change editor mode

commit 85e42c618c7f502a6fb42f4f370be9703eccb3aa
Merge: f7c8f5c bc93c6c
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 15 13:24:18 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f7c8f5c6a7a0fcecde29ae0c3fe3992891c1ea20
Merge: ef9ceed 65d7ab3
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 15 09:29:37 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ef9ceed08e881f282adb2def90faf9459c25a103
Merge: e027896 cde6835
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 15 09:17:22 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit e0278969d0298cdf29862728b094e7946e983f3d
Merge: 2178dce 4c476f5
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 23:11:30 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2178dce09da6278cf7ff72f8f3c76e664688902d
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 23:11:07 2014 +0100

    Fix save default title

commit 755ee2545d27ffdb844163bd5edd710e7173c330
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 23:10:34 2014 +0100

    Fix plurial

commit 3539d1c755ca3071feb55d05318e4d4cace4a23b
Merge: 598a8ce abf53c3
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 14:11:52 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 598a8ce596609a8d962174336444a31d1fb245f5
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 14:11:32 2014 +0100

    Allow to customize default note title

commit 95fe4e2bd6dedd1588db50290a1c5f5dbf6dcc06
Merge: 4052e6a bfad848
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 09:41:48 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 4052e6aa1dbeb3bba16b78555f074e37d864088e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 09:33:42 2014 +0100

    Fix label

commit e073efa2422e703a953a53df62917f233530506d
Merge: a0a4c2b 0b624b1
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 09:28:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a0a4c2b63e3714b2491a7bc8988383974a177b65
Merge: d6402e3 1a241b1
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 08:55:59 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit d6402e33b268c7e998a86e2adcb02bdbb6ba2ef3
Merge: aa68a4e 8e82056
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 08:35:43 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit aa68a4ea9eeaeba6dc45203aefd509d798a63026
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 14 07:09:34 2014 +0100

    Fix gotoline action enable status

commit c7c85e50801bebe9c9f99522d64bb0a5bb01d0b5
Merge: 9ff5661 98b18c0
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 22:35:12 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 9ff5661690c272c4bbac1020d6e159c1f5079cb8
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 13:29:19 2014 +0100

    Move shortcut in apps directly

commit 2fa078e7578160f6e246d3289325be45b1f8aabf
Merge: 34b6a49 4c1deb3
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 13:27:42 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 34b6a49b55d60f65c97a376b0aea3135f819686d
Merge: a28bf9d 8165796
Author: David Jarvie <djarvie at kde.org>
Date:   Thu Mar 13 11:44:09 2014 +0000

    Merge branch 'KDE/4.13'

commit a28bf9d27a86b8476e769879a81f1f0e14d32a5c
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Mar 13 12:08:24 2014 +0100

    Reconnect to PostgreSQL database when the Akonadi server is restarted
    
    Now I don't have to restart Akonadi Console every time I restart Akonadi.
    This improves Andras' patch that detected only MySQL to cover PSQL too.

commit f54bc8c8500d5346e6f046481ad778567ea9ff49
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 09:54:38 2014 +0100

    Add action to show "gotoline" widget

commit 508ee702c4f94a9e4043deddadac037138ed5ec3
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 08:40:21 2014 +0100

    Move modified to libksieve directly

commit c85996f55c0d1811945fb5ab7c8c2cfdc6162984
Merge: dd1d031 ffb022e
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 08:10:09 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dd1d0312c46bb72567c6f61c95300e08b8f1b26a
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 08:07:41 2014 +0100

    Add icon.

commit 5b0369ca438c42f877b81581a9a87005fd92adc5
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 07:49:01 2014 +0100

    Fix set focus

commit 713884761ce074c129a52769e29d68a0a6775df0
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 07:44:00 2014 +0100

    When we click enter in spinbox go to line

commit 63e05be68c70accb923dcd601ffec0fd6ca91f59
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 13 07:38:47 2014 +0100

    implement move to line

commit 75bf0f48bca0d28499a1ac6d6e53b92c3074c8aa
Merge: 3794e5b d3a1fa7
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 22:16:57 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	sieveeditor/sieveeditorpagewidget.cpp

commit 3794e5b10be8f90cfc617a314d547c4e20a0dc38
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 22:12:57 2014 +0100

    Add goto line widget

commit 47e540e36f4c5d33970f90c5932b63c377349b8f
Merge: 53e74cb 9178b01
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Mar 12 16:11:45 2014 +0100

    Merge branch 'KDE/4.13'

commit 53e74cb746b94e1906f0e592d6d43ee9391ff076
Merge: 538abdd c90a874
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 14:02:09 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 538abdd8ce0ffddf8ad4306af6e3ba08508e54b3
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 14:00:07 2014 +0100

    Start to create new gotoline widget

commit 491a51aed90d063f3126d8b905d88b35366962ab
Merge: 227406f fd33225
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 13:40:31 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 227406f00723be6e34134355ac4782d556616579
Merge: 01f2686 e262b76
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 09:09:31 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 01f2686ca55d5a253e9c19c9ce17725fa864c75b
Merge: 0d7bc08 69b042f
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 12 08:33:54 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0d7bc08604fd4da77c0410c2f3e17f88506061c3
Merge: 8047f88 d83611f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 22:33:33 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8047f88e361a028eedc14b17c312ccbdf034ea08
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 22:23:56 2014 +0100

    Fix compile

commit aa582e7bf240b064645ff880c93b09d6bcb48c68
Merge: c739186 d002cde
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 22:18:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c7391863bef6828528272ed76fbcd762c01f2bf8
Merge: 1ba414f a6ce7d0
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 22:18:01 2014 +0100

    Merge branch 'master' of git.kde.org:kdepim

commit a6ce7d0ec1ebe5985e374c9943fcb62221f5c0ce
Merge: 49469df f29e082
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 20:07:45 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit 1ba414f80b06d8696c84de75b353593ea24d615b
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 09:18:43 2014 +0100

    Add specific class for tabwidget. Add menu to close page or all other tabs

commit 49469df7088f9f8c0940bb3852c32ee76f97f0f9
Merge: c50e513 a99f18a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 08:31:42 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c50e513b548f159c00e3a8cc090521de5d8c37b2
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 08:13:51 2014 +0100

    Allow to close tab

commit 3094a9a75b232ee4252bc49caee8b7c40eed4144
Merge: c6eb086 da2f6de
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 07:46:17 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c6eb086cf8d7a52c86b6625ef540e603e7ffa6ea
Merge: db2e948 54d2dff
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 11 07:15:23 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit db2e948ae4e380d002d7477e26a628063d9c0954
Merge: ff5e76d fed5e26
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 23:47:34 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ff5e76d99d70ecba416108fc842b5f00cf0a5967
Merge: c1ffe1a c11fdfd
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 13:47:20 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c1ffe1a99508b2299188a6d833706ef82b7eada0
Merge: 8c469b7 75b0c06
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 13:21:30 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8c469b78c3a1dc338b4c86cfc15c10c38c7db394
Merge: a8af98e 9028ef1
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 09:38:15 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a8af98ed70aac09d14b2bb78465c8fa9fc314dbd
Merge: ccef7b6 477b2fa
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 08:53:14 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ccef7b6a3615c86f2a12f679ce98e944161a15f1
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 08:43:35 2014 +0100

    Add info about not supported feature

commit 4de63dfd5bcd72332cb188b8ed2d14838f03dd45
Merge: 50b3450 5700e9f
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 10 08:38:34 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 50b34500330412fe4ca7bfa7ff5be25818fdb128
Author: David Jarvie <djarvie at kde.org>
Date:   Mon Mar 10 00:38:41 2014 +0000

    Formatting

commit 532dc0b2f906bd65581e7cbeb1d2b14f4e3348d9
Merge: 7d3e222 6b029e7
Author: David Jarvie <djarvie at kde.org>
Date:   Sun Mar 9 23:54:05 2014 +0000

    Merge branch 'KDE/4.13'

commit 7d3e2222183c0d249dc3b5d0ec5da7e1136dfa03
Merge: 0db5740 e51216e
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 18:03:58 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0db574099aa816afedb325358bdafe337bbb69cd
Merge: 5f8a8d8 9c66c2f
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 12:06:57 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 5f8a8d81b3510d03888745fc1120e225b5b48f1c
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 11:16:14 2014 +0100

    Increase version

commit 37d552ef9457e5659f772c9ba36356bf73eb6110
Merge: 6777baf ea7c8de
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 11:15:44 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6777baf5445405243fa4af245eb89f0af5fc2107
Merge: 253c97e 1dcd2f0
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 10:15:22 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 253c97eba8c3050c44c8afb74f5ebdfa6a534f46
Merge: 205d9e5 de5771e
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 09:45:13 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 205d9e593621b5335a6e07500b4ebe2919c820f2
Merge: 1e30e52 ae253a4
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 09:07:42 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 1e30e52d8bc13e77730f867fd41417c4055ba070
Merge: 2e1704a ffbf021
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 09:06:54 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit 2e1704a036d0a29b22035c5e0442882d4f89f0a7
Merge: 26b70af ae06537
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 07:40:04 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 26b70afc26aa2f0f99fb95df8141f979de44e9ce
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 01:04:06 2014 +0100

    Add missing endline

commit 4f9e81db93f504254dac465b5cc38a6269821c3b
Merge: a8c84fd bdb889d
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 9 01:02:51 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a8c84fd21bc3b80a2f24933c5214c79f49da846a
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:51:29 2014 +0100

    You forgot to add condition

commit 90a9a2cc40200de4f4958725f37cbdb630a426e3
Merge: 580b7e0 7798cf9
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:51:15 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 580b7e032772eb47211aabfc2d2717a98f999eff
Merge: 946c7c9 b9c58af
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:48:15 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 946c7c9c80f2aa7a8568479625ad1e61f15eda8d
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:28:49 2014 +0100

    Fix captions

commit dc9f2c3d232a2b4e9c72c2a43e123542ade93cd7
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:24:53 2014 +0100

    Add caption

commit ba43137db63f7b6c31c129f810d339a9f731e696
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:14:53 2014 +0100

    Add caption

commit 4f64bbb2f7f7a839d4534f42769ca15ee6bfa75e
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 22:07:00 2014 +0100

    Create archive to uplod it

commit 3c19b2f048d81cd68a6e26dd7b5d50d0efaf2c63
Merge: be0f449 ed1cb01
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 21:45:16 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit be0f449c195d754c1995483356c186431c27bb0e
Merge: 20b736e 1fa03ba
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 13:19:00 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 20b736e16598d3bdd6f018e2fe2172b88b04d941
Merge: da5dfef 824c189
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 12:52:23 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit da5dfef2e889570724da8ebc964066e5a00954d2
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 8 10:27:20 2014 +0100

    Start to implement upload sieve script

commit 11daf5a3a4ecfdbc208d30397fb5a47ed952db63
Merge: 57b7ade b9cca72
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 23:37:51 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 57b7ade564624907775fed98255ef8b62e41182b
Merge: 80d265d ff9eadf
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 23:35:50 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 80d265ddaa2f382e19ea0b9ea6f83306cb1dd76c
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 22:16:54 2014 +0100

    improve redirect dialog. Add support for resent-cc/resent-bcc

commit 836e46475c79b8c32bd338ebdaa99a4f3007aea5
Merge: c2b4ce7 f4a951a
Author: David Jarvie <djarvie at kde.org>
Date:   Fri Mar 7 14:01:03 2014 +0000

    Merge branch 'KDE/4.13'

commit c2b4ce736834e8e94bbe270dcf9fbd7f86570f48
Merge: 0272ad1 5f9a978
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 13:59:26 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0272ad10cfc62883181e9c6f1b8d6111076f3b31
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 09:36:13 2014 +0100

    Minor

commit f36bb8acff479c8486ae2861a9dcd0cc12100007
Merge: 8722141 0dc29da
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 09:35:18 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8722141790eacb897eb5a9dc6b6d42bec365acb0
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 09:01:02 2014 +0100

    Add sentence case feature

commit b775d6033c76c694d481f9176c47167b75bb2a16
Merge: dfe2132 6fce5eb
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 08:11:51 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dfe213267f0f933490414ad41254bfe58c05aba1
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 08:00:49 2014 +0100

    Add info about undo

commit 3e4a24c7a4b5ad621dc28bee0fa98a375d9197ce
Merge: b6090b4 655bf3e
Author: Montel Laurent <montel at kde.org>
Date:   Fri Mar 7 07:34:34 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b6090b4ea422e2656f7a90137ee90186d85f2cf9
Merge: fafca26 8aca590
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 22:44:11 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit fafca26a9d237fe3706480083ccb930bb16bfa4f
Merge: 2973ba1 56a9478
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 09:43:59 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2973ba1e59618b06c2d95e4fdb4bda74328d388a
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 09:22:09 2014 +0100

    It's an event

commit 1a1f13cf4a546cce377076218e36116349962685
Merge: bef2076 2244777
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 08:49:27 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit bef2076bd36ddac74a4357c923114e7980631495
Merge: fffc983 dfa6671
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 08:21:41 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit fffc9835b7b705e247c422cb6a8603986a5ade4d
Merge: ac57224 fadaf08
Author: Montel Laurent <montel at kde.org>
Date:   Thu Mar 6 08:01:05 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ac572240b7e91fb5c6edc9ffd153c98f4cddbb9c
Merge: 677c987 cf70e5b
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 22:01:38 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 677c9877d960b67b0105e061f738984a472644df
Author: Aaron Seigo <aseigo at kde.org>
Date:   Wed Mar 5 21:49:25 2014 +0100

    don't crash when parts is empty
    
    happens when the path is, e.g., '/'. fixes use with mykolab.com
    for instance.

commit 95c820f2692cb0fb9c28c869dea1ae8bdb0f6e56
Merge: 103db09 708b563
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 15:39:06 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 103db09f9e2ac84effda49c223c2eb8d70892c5e
Merge: 74c08c7 891c30b
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 13:59:40 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 74c08c7bf93034e15a3cd17e4a7654ab815c478a
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 13:46:23 2014 +0100

    Add create_event in menu too

commit 84445ac5008fefea29baa6b405d9fabdbb07d17e
Merge: cc6b069 f08e527
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 13:42:44 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit cc6b0693083e54191faa3976f55dcb08507ccdea
Merge: 6b70476 6c09209
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 13:14:51 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6b70476384fe4858fb7084452613dc771d3280dc
Merge: 5e7bb26 d745db0
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 09:42:36 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	pimcommon/translator/tests/translatortest.cpp
    	pimcommon/translator/tests/translatortest.h

commit 5e7bb26a9338b55d4ba8f5ee24083cc58659e697
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 08:12:15 2014 +0100

    We need a unittest for this component too

commit 5b86219020c90d08703ddd7cf186eba727bbad20
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 07:52:53 2014 +0100

    Fix clear debug dialog too

commit 685d0d08575d69659f1491830b1f043f42cdf9c7
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 07:39:25 2014 +0100

    Fix margin/spacing

commit 939e2f15a19b7e4c62b0620626c5d4955e728fba
Merge: 7ede185 67a6c5c
Author: Montel Laurent <montel at kde.org>
Date:   Wed Mar 5 07:32:45 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7ede185d520487493b234879655cdad72e193ef8
Merge: 337cf88 2eccf89
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 21:29:22 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 337cf885f08fce2a6f613dca84a74ef69a6e0517
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 21:28:18 2014 +0100

    Add menu entry

commit 29f4506be82cb7035658eb34ca72e5d441fbc8a5
Merge: 2ae274d 50407bf
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 19:58:37 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2ae274dca1473a80461db2e7acdb562c3ee0529a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 19:58:21 2014 +0100

    Fix jenkins

commit a1eb3e077558cf8a785deefe62dfdcd862f48bac
Author: Abhijeet Nikam <connect08nikam at gmail.com>
Date:   Mon Mar 3 22:43:33 2014 +0100

    Fixed QML code style issues
    
    See https://community.kde.org/Plasma/QMLStyle
    
    mail/AclEditor.qml
    REVIEW: 116546
    
    mail/AttachmentEditor.qml
    REVIEW: 116547
    
    lib/CompletionSlider.qml
    REVIEW: 116551
    
    lib/BulkActionList.qml
    REVIEW: 116548
    
    lib/calendar/ClockDialog.qml
    REVIEW: 116550
    
    contacts/ConfigDialog.qml
    REVIEW: 116552
    
    lib/BulkActionScreen.qml
    REVIEW: 116549
    
    lib/calendar/CalendarDialog.qml
    REVIEW: 116593
    
    contacts/contact-editor.qml
    REVIEW: 116594
    
    contacts/ContactListView.qml
    REVIEW: 116595

commit 94942f751a16de678fdd6c5ad43a96581f406d41
Merge: 9d80f75 e07ddd4
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 13:58:50 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 9d80f75ddbd25ece629d60693fb8c45a48756efc
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 13:10:23 2014 +0100

    Don't emit signal when date is not valid.

commit 238b6038884143566718f99b8b912ac76a9949a6
Merge: c3a9a5b e9712e4
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 09:37:36 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit c3a9a5b6aa3967f113b221c5919390a92cd8e768
Merge: dd24280 a0c8b1f
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 08:26:53 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit dd2428015041f8be0d61c9f3454d4c3d38095130
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 07:50:18 2014 +0100

    Set margin at 0

commit 73f7784fdc210a0929bfb6e00da6632c6211bf8a
Merge: fd24ef6 5b05db3
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 07:47:29 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	storageservicemanager/data/storageservicemanager.notifyrc

commit fd24ef6f6fbe82d02b8c9ca7e739d950a164894a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 07:39:15 2014 +0100

    Fix save/load default collection

commit 5dbf1b302d9751999f65ad18f8e5ea4c9e56105a
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 07:25:15 2014 +0100

    Remove not necessary code now

commit 8c706c3e948650cb90106054b1e7a2b803529539
Author: Montel Laurent <montel at kde.org>
Date:   Tue Mar 4 07:16:23 2014 +0100

    Add shortcut for creating event. Improve unittest for viewer

commit 42284fbffe41c4a45c7c5de56ea7e1b63b59ce1c
Merge: 6b96a33 1966d2f
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 21:58:08 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6b96a33b4f7c2d7c1b83701141da8e44528a890d
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 21:39:28 2014 +0100

    Fix Bug 331317 - Feature request - Create Calendar event from E-Mail
    
    FIXED-IN: 4.14
    BUG: 331317

commit 4ddb6bcadfad78076ac32cbef41c62b634a2fbea
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 21:33:21 2014 +0100

    Add action. Reduce spacing

commit 06c417d904771f17590c67b0bd559a0f643ed3fc
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 21:29:58 2014 +0100

    Add end/start time

commit ac28f27cbf6db425ef9ae0050a649cbb66bef2d1
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 21:23:19 2014 +0100

    Add createEventAction

commit c22060126fd1d46b54dce3434062c2703312aa58
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 20:29:41 2014 +0100

    implement create event

commit 3b64fbfa01f105ee5eabf8b48f5d9a5ae4e05416
Merge: f37145f 53e3eac
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 16:49:48 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit f37145f68833f548aa56fb7a066cde00f6583c5b
Merge: 49ae45a 0766174
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 08:43:27 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 49ae45ad23361bace6ceb3718689d07925b1b716
Merge: 398e34c 1860237
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 08:30:39 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kmail/configuredialog/configureappearancepage.cpp

commit 398e34c81f4be35a2357cb9a2a2352f606f41c58
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 07:46:35 2014 +0100

    Ask if you want to remove tag

commit 7f6f885bea493df20187916f785ce9a6bb1835e0
Merge: a384880 2ff71c5
Author: Montel Laurent <montel at kde.org>
Date:   Mon Mar 3 07:22:35 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a3848807ccc36b3a31e033386c0f9bd887a77604
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Mar 3 04:33:50 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 3f11a16147c104dcba055b9d9bc2f0a75213591a
Author: Abhijeet Nikam <connect08nikam at gmail.com>
Date:   Sun Mar 2 15:45:21 2014 +0100

    Fixing coding style in various KMail mobile QML files
    
    Adjust according to rules of
    https://community.kde.org/Plasma/QMLStyle
    
    Action.qml
    REVIEW: 116478
    
    Button2.qml
    REVIEW: 116512
    
    AttachmentList.qml
    REVIEW: 116510
    
    contacts/BulkActionComponent.qml
    REVIEW: 116511
    
    ActionList.qml
    REVIEW: 116500
    
    AgentStatusIndicator.qml
    REVIEW: 116508
    
    AgentInstanceListDelegate.qml
    REVIEW: 116506
    
    ActionListItem.qml
    REVIEW: 116501
    
    ActiveActionMenuItemDelegate.qml
    REVIEW: 116504
    
    AgentInstanceListContainer.qml
    REVIEW: 116505

commit 06dff6eb896714e7436b640576de402d2b4e7895
Merge: 6a51ed0 00aa93d
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 17:52:43 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 6a51ed0cf5368e772e59bc9fdfe63eb66c03bff6
Merge: a689604 893043c
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 17:24:48 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit a6896045304df0f3d89689ba0f08d77c15a429db
Merge: cc822aa 3fc29b9
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 13:49:03 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit cc822aa05ee3647f6561abecfc3fb4804d5e6cfc
Merge: 2db5031 91856b6
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 12:41:38 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 2db503151beba11a95e4d54ad3ed1aec519229c3
Merge: b1d806b 8b2d8ab
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 10:33:24 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit b1d806ba1e81f777398214534e7c48dbf6337ac8
Merge: 3355aea 31791c8
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 09:43:01 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 3355aeaa85dae9dd840c2c3ca69e9fc098496014
Merge: 894142c d99bbea
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 09:16:38 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 894142cda226f39e2417933cd2d8dee85b073714
Merge: 65d1817 cb10514
Author: Montel Laurent <montel at kde.org>
Date:   Sun Mar 2 08:29:24 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kontact/plugins/knotes/knotes_part.h

commit 65d18170f4aa7e51e242d1186addd86cd8cbde8a
Merge: 0eadf0b 7da6158
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 19:11:20 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 0eadf0baeeb0df23fbb5fecc1ef7a8ec38a763fb
Merge: 64397a7 f17e885
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 19:09:32 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 64397a741825a91de4d1b9a664746cb24b3139a3
Merge: 2f6817e bbabc77
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 18:44:12 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	CMakeLists.txt

commit 2f6817e46a09cdddf1270e2a40d97fdf63d8e3d2
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 18:43:33 2014 +0100

    Update quicksearch shortcut

commit c73972eaef9b0b81bbd8cb7536b19cb79b29cbe6
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 17:36:53 2014 +0100

    Allow to add quicksearchline shortcut

commit 1afcb75490d181fb3b189533922f5fae0b61e6e3
Merge: 039ea81 f80e4a1
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 09:58:40 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 039ea816d6e4223adef6f8d1b82783b96321d440
Merge: d679d1e 57dae6a
Author: Montel Laurent <montel at kde.org>
Date:   Sat Mar 1 09:43:09 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit d679d1e045847362853f90b3d43eacadddd1e8d5
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Mar 1 04:23:12 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit 72ddad1248e1c12110d784daf704ee36c5f40edc
Merge: ceedce0 1af8c9f
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 18:55:10 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit ceedce07aa123d647f56a73787c23eb1ab298fa6
Merge: 308c4f4 3ab8c40
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 18:19:54 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 308c4f44d88186b2dcc47ab410a4f9a08888d240
Merge: 8557ea7 b17bca3
Author: Alexander Potashev <aspotashev at gmail.com>
Date:   Fri Feb 28 16:35:57 2014 +0400

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8557ea74e358b27a4bb4ec906312139fbf22740f
Merge: 8be312b 2962193
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 10:45:52 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8be312ba24a8d7fd7ba7953eebb1856e76119d11
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 10:28:55 2014 +0100

    Add rename action

commit 20c8a704ff8253b59467f9a7d6897989dedd3f23
Merge: 9c3bd9f 3013b79
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 10:15:37 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 9c3bd9f20ccf2c65287a48cea297a3eac7caccd1
Merge: 7bec9c9 21f9b37
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 09:40:07 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 7bec9c9e2f8dd7644a82722c6a909d8a2d81adbc
Merge: 43af97b 0a363dc
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 09:02:54 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 43af97b09d615b87a050f1ef78f9efe11dd994a7
Merge: bff216b 612f291
Author: Montel Laurent <montel at kde.org>
Date:   Fri Feb 28 08:24:22 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kontact/plugins/korganizer/kcmtodosummary.desktop

commit bff216bfd162a030e325fb736c1d48953ad7e853
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Feb 28 07:00:52 2014 +0000

    SVN_SILENT made messages (.desktop file)

commit f0617a2d3b048fcf0ae8c5da89c254f90ea01a73
Merge: 42750d3 d7c28a4
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 20:45:44 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'
    
    Conflicts:
    	kontact/plugins/korganizer/kcmtodosummary.desktop

commit 42750d3f1551774843cefa2cbf00ce2a779c28cb
Merge: 8210d47 2b724c9
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 13:59:49 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 8210d475ab35734c46231a693feb1b1c26558ec4
Merge: 35ff6bc 889764d
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 09:51:09 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 35ff6bcb9c77a0af67fdcf9b8e02637267e216b7
Merge: 1c876e7 8539628
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 08:52:43 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit 1c876e76db2f8c375751d3e76ddc4727646a5707
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 07:19:31 2014 +0100

    master is open

commit cf28b99ffb183e11339cde437f8a01542cdbca74
Merge: bae18ae f52064c
Author: Montel Laurent <montel at kde.org>
Date:   Thu Feb 27 07:17:09 2014 +0100

    Merge remote-tracking branch 'origin/KDE/4.13'

commit bae18ae65c09d00b5f4fbefbfe3e77f678f9c921
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Feb 27 04:46:19 2014 +0000

    SVN_SILENT made messages (.desktop file)




More information about the commits mailing list