Montel Laurent
|
89151e6c41
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kaddressbook/sendmail/mailsenderjob.cpp
kmail/editor/kmcomposewin.cpp
messagecomposer/utils/util.cpp
|
11 years ago |
|
Montel Laurent
|
a34c8cf176
|
Move function to pimcomm directly
|
11 years ago |
|
Montel Laurent
|
9c1a52b523
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/antispam-virus/antispamwizard.cpp
kmail/antispam-virus/antispamwizard.h
kmail/kmmainwidget.cpp
messagecomposer/job/attachmentvcardfromaddressbookjob.cpp
|
11 years ago |
|
Montel Laurent
|
d0fa79ee30
|
Fix Bug 342744 - Put into trash and delete mail should not have the same icon
FIXED-IN: 14.12.2
BUG: 342744
|
11 years ago |
|
Montel Laurent
|
a58034b6ea
|
Fix forward declaration
|
11 years ago |
|
Montel Laurent
|
46f921c1a3
|
not necessary to store pointer
|
11 years ago |
l10n daemon script
|
c1772b7e23
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
Montel Laurent
|
4491037124
|
Clean up
|
11 years ago |
|
Montel Laurent
|
f419375199
|
Minor
|
11 years ago |
|
Montel Laurent
|
f6d672d6c7
|
Use Q_DECL_OVERRIDE
|
11 years ago |
|
Montel Laurent
|
86465f7873
|
Compile when we use "-DBUILD_TESTING:BOOL=FALSE"
|
11 years ago |
|
Montel Laurent
|
c1220c774d
|
Remove kdelibs4support
|
11 years ago |
|
Montel Laurent
|
97a70288f4
|
Use Q_NULLPTR
|
11 years ago |
|
Montel Laurent
|
b50823e41e
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
korganizer/htmlexportjob.cpp
messagecomposer/attachment/attachmentcontrollerbase.cpp
messagecomposer/job/attachmentvcardfromaddressbookjob.cpp
|
11 years ago |
|
Montel Laurent
|
bfba3a4705
|
astyle kdelibs
|
11 years ago |
|
Montel Laurent
|
b8f58cb15e
|
Try to fix Bug 342803 - kmail tray icon tiny with QHD display
BUG: 342803
|
11 years ago |
|
Montel Laurent
|
417e03022c
|
Use exportVCards here
|
11 years ago |
|
Montel Laurent
|
2b383bc15c
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/sendlateragent/sendlaterutil.cpp
agents/sendlateragent/sendlaterutil.h
kmail/editor/kmcomposewin.cpp
|
11 years ago |
|
Montel Laurent
|
a581824f87
|
Fix mimetype
|
11 years ago |
|
Montel Laurent
|
3b70efdf5a
|
Fix dnd contactgroup
|
11 years ago |
|
Montel Laurent
|
94cc9a39c7
|
Move in util class
|
11 years ago |
|
Montel Laurent
|
42225bcdd1
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/kmreadermainwin.cpp
kmail/kmreaderwin.cpp
kmail/kmreaderwin.h
messageviewer/viewer/viewer.h
messageviewer/viewer/viewer_p.h
|
11 years ago |
|
Montel Laurent
|
e92c90dfad
|
Don't show mimetreeview if model is empty (as when we show a patch in kmail)
|
11 years ago |
|
Montel Laurent
|
9ac2c8922e
|
Show action when we have a valid message
|
11 years ago |
|
Montel Laurent
|
44e300841d
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
|
11 years ago |
|
Montel Laurent
|
bd4f916684
|
Fix googletalk
|
11 years ago |
|
Montel Laurent
|
fcbccc9c63
|
Merge remote-tracking branch 'origin/KDE/4.14'
|
11 years ago |
|
Montel Laurent
|
045316f81e
|
Fix warning
|
11 years ago |
|
Montel Laurent
|
a0bd82bd9c
|
Port cmakelists.txt, fix install notifyrc file; port to kf5
|
11 years ago |
|
Montel Laurent
|
f3a723c15a
|
Update installation variables.
|
11 years ago |
|
Montel Laurent
|
f8bc02a6dd
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
kmail/folderarchive/folderarchiveagentjob.cpp
|
11 years ago |
|
Montel Laurent
|
89c6c84a97
|
Move in own class
|
11 years ago |
|
Montel Laurent
|
5b69ffea36
|
Fix variable name
|
11 years ago |
|
Montel Laurent
|
9833f8bce6
|
Clean up
|
11 years ago |
|
Montel Laurent
|
1630c8ba54
|
Astyle kdelibs
|
11 years ago |
|
Montel Laurent
|
6e67f0c9cc
|
Use Q_NULLPTR
|
11 years ago |
|
Montel Laurent
|
f395c9444d
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/configuredialog/configurecomposerpage.cpp
libkdepim/addressline/addresseelineedit.cpp
libkdepim/addressline/addresseelineedit.h
messagecomposer/composer/composerlineedit.cpp
|
11 years ago |
|
Montel Laurent
|
dc52f9d887
|
Fix Bug 342593 - During address completion, cannot exclude 'recent addresses'
FIXED-IN: 14.12.1
BUG: 342593
|
11 years ago |
|
Montel Laurent
|
ab0ecb3355
|
astyle kdelibs
|
11 years ago |
|
Montel Laurent
|
8dfbc3273c
|
Clean header
|
11 years ago |
|
Montel Laurent
|
ea1189e27b
|
Astyle kdelibs
|
11 years ago |
|
Montel Laurent
|
38dae40928
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/kmlaunchexternalcomponent.cpp
kmail/kmmainwidget.cpp
|
11 years ago |
|
Montel Laurent
|
1c7ed285fb
|
Move code to LaunchExternalComponent
|
11 years ago |
|
Montel Laurent
|
12a8630ffa
|
Port to new connect api
|
11 years ago |
|
Montel Laurent
|
cd0c69789a
|
Fix pragma
|
11 years ago |
|
Montel Laurent
|
7bc19fbd15
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
mailcommon/collectionpage/collectiongeneralpage.cpp
mailcommon/kernel/mailkernel.cpp
mailcommon/kernel/mailkernel.h
pimcommon/util/imapresourcemanager.cpp
|
11 years ago |
|
Montel Laurent
|
abd9f24665
|
Better to move this code to mailkernel directly
|
11 years ago |
|
Montel Laurent
|
a4b557ded8
|
Use imapresourcemanager
|
11 years ago |
|
Montel Laurent
|
a521c417a0
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
pimcommon/autocorrection/autocorrection.h
templateparser/tests/templateparsertest.cpp
|
11 years ago |
|
Montel Laurent
|
316bd1075b
|
Fix copyright
|
11 years ago |
