Montel Laurent
|
da06eca70e
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/kmreadermainwin.cpp
|
11 years ago |
Montel Laurent
|
7622cfed1f
|
Fix duplicate code
|
11 years ago |
Montel Laurent
|
3b3798e125
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/mailmerge/mailmergedialog.cpp
kmail/mailmerge/mailmergedialog.h
kmail/mailmerge/tests/CMakeLists.txt
kontact/plugins/knotes/knoteseditdialog.cpp
libkdepim/addressline/autotests/CMakeLists.txt
libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp
libkdepim/addressline/completionorder/completionordereditor.cpp
libkdepim/addressline/completionorder/completionorderwidget.cpp
libksieve/ksieveui/templates/sievetemplateeditdialog.cpp
mailcommon/filter/filterimporter/filterimporterabstract.cpp
mailcommon/filter/filterimporter/filterimporterprocmail.cpp
mailcommon/filter/filterimporterexporter.cpp
mailcommon/filter/kmfilterdialog.cpp
pimcommon/templatewidgets/templateeditdialog.cpp
|
11 years ago |
Montel Laurent
|
48637df408
|
Add more unittest
|
11 years ago |
l10n daemon script
|
12d2557281
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
Montel Laurent
|
c092e89159
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
libkdepim/addressline/addresslineedit/addresseelineedit.cpp
libkdepim/addressline/autotests/CMakeLists.txt
libkdepim/addressline/autotests/baloocompletionemailtest.cpp
libkdepim/tests/testaddresseelineedit.cpp
messagecomposer/composer/composerlineedit.h
plugins/messageviewer/bodypartformatter/attendeeselector.cpp
plugins/messageviewer/bodypartformatter/calendar/attendeeselector.ui
plugins/messageviewer/bodypartformatter/delegateselector.cpp
|
11 years ago |
Montel Laurent
|
49078b98b7
|
Move in own directory
|
11 years ago |
l10n daemon script
|
279ff47614
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
Montel Laurent
|
51836bd8df
|
Use Q_NULLPTR
|
11 years ago |
Aleix Pol
|
884d0bed51
|
Remove kdepim-specific variable KDEPIM_BUILD_STATIC
If a static build is required use the generic BUILD_SHARED_LIBS from
extra-cmake-modules.
|
11 years ago |
l10n daemon script
|
f3d47f4590
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
Montel Laurent
|
5792a2dc2f
|
Use ecm_add_app_icon
|
11 years ago |
Montel Laurent
|
c63340e615
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
knode/kncomposer.cpp
knode/knmainwidget.cpp
libkdepim/addressline/autotests/CMakeLists.txt
|
11 years ago |
Montel Laurent
|
4d95aa627e
|
Move in own directory
|
11 years ago |
Montel Laurent
|
f80c45a4f1
|
Use Q_NULLPTR
|
11 years ago |
Montel Laurent
|
1e618fb651
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
knode/kncomposer.cpp
libkdepim/addressline/recentaddresses.cpp
libkdepim/addressline/recentaddresses.h
mobile/mail/configwidget.cpp
pimcommon/texteditor/plaintexteditor/plaintexteditor.h
pimcommon/texteditor/richtexteditor/richtexteditor.h
|
11 years ago |
Montel Laurent
|
b9904cef38
|
Move in own directory. Add unittest
|
11 years ago |
Montel Laurent
|
c4cf4a4768
|
Create a class for recentaddressdialog
|
11 years ago |
l10n daemon script
|
a4d1a6dd34
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
Montel Laurent
|
816f8e761c
|
not necessary to have "/* reimp */" when we already use Q_DECL_OVERRIDE
|
11 years ago |
Montel Laurent
|
1371f3c172
|
astyle kdelibs
|
11 years ago |
Montel Laurent
|
bb55c5db8c
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kaddressbook/merge/autotests/CMakeLists.txt
kaddressbook/merge/autotests/mergecontactselectinformationscrollareatest.cpp
kaddressbook/merge/autotests/mergecontactwidgettest.cpp
kaddressbook/merge/manualmerge/mergecontactwidget.cpp
kmail/mailmerge/widgets/mailmergewidget.cpp
kmail/tests/CMakeLists.txt
|
11 years ago |
Montel Laurent
|
26cb3ad42f
|
Add unitestenv
|
11 years ago |
Montel Laurent
|
ade1fd5524
|
isolate unittest
|
11 years ago |
Montel Laurent
|
ea32230224
|
Fix name
|
11 years ago |
Montel Laurent
|
6ce1c9d901
|
use QStringLiteral
|
11 years ago |
Montel Laurent
|
d49b3fd956
|
Use QStringLiteral
|
11 years ago |
Montel Laurent
|
5bf7c0929d
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kaddressbook/merge/autotests/CMakeLists.txt
kaddressbook/merge/job/searchpotentialduplicatecontactjob.h
kaddressbook/merge/widgets/mergecontactinfowidget.h
kmail/kmreadermainwin.cpp
kmail/kmreadermainwin.h
korganizer/korganizer_part.rc
|
11 years ago |
Montel Laurent
|
c2721e6a28
|
Rename method
|
11 years ago |
Montel Laurent
|
ab45f02ddb
|
Fix Bug 344372 - moving/ copying messages from viewer
Fix move message from viewer.
CCBUG: 344372
|
11 years ago |
Montel Laurent
|
b9af3b46eb
|
Remove deprecated method
|
11 years ago |
Montel Laurent
|
c4b570280d
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
kmail/editor/potentialphishingemail/potentialphishingemailwarning.cpp
|
11 years ago |
Montel Laurent
|
9864055882
|
Use QStringLiteral when necessary
|
11 years ago |
Montel Laurent
|
fbf510ba68
|
Check "\"<foo@kde.com>\" <foo@kde.com>" it's not a potential phishing email.
Thanks David to signal me it
|
11 years ago |
Montel Laurent
|
e30fb0ea42
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/kmreadermainwin.cpp
kmail/mailmerge/tests/CMakeLists.txt
sieveeditor/sieveeditormainwidget.cpp
sieveeditor/sieveeditormainwindow.cpp
sieveeditor/sieveeditormainwindow.h
|
11 years ago |
Montel Laurent
|
a00110bdf1
|
Fix i18n (Reuse existing i18n)
|
11 years ago |
Montel Laurent
|
ac37dcfd5e
|
improve unittest
|
11 years ago |
Montel Laurent
|
c93a1ceb59
|
Use addressbookwidget
|
11 years ago |
Montel Laurent
|
ca70c713a1
|
Port to QTest
|
11 years ago |
Montel Laurent
|
f6d2370d10
|
Fix includes
|
11 years ago |
Montel Laurent
|
2644248e2a
|
Port to QDialog
|
11 years ago |
Montel Laurent
|
ca7dd36dd4
|
Fix unittest
|
11 years ago |
Montel Laurent
|
ee1d7ac56e
|
Astyle kdelibs
|
11 years ago |
Montel Laurent
|
064dc0959b
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/followupreminderagent/jobs/followupreminderfinishtaskjob.h
kaddressbook/merge/job/mergecontacts.h
kaddressbook/merge/widgets/mergecontacterrorlabel.h
kaddressbook/merge/widgets/mergecontactshowresulttabwidget.h
kaddressbook/sendmail/autotests/CMakeLists.txt
kaddressbook/sendmail/mailsenderjob.h
kaddressbook/sendvcards/autotests/CMakeLists.txt
kaddressbook/sendvcards/sendvcardsjob.h
kmail/autotests/followupreminderselectdatedialogtest.cpp
kmail/followupreminder/followupreminderselectdatedialog.cpp
|
11 years ago |
Montel Laurent
|
596227f747
|
Remove not necessary include
|
11 years ago |
Montel Laurent
|
4213e92298
|
Disable ok button when date is empty
|
11 years ago |
Montel Laurent
|
1876f39e26
|
Port to QUrl
|
11 years ago |
Montel Laurent
|
29782d014f
|
Port to QUrl/QDialog
|
11 years ago |
Montel Laurent
|
bbbe261bfa
|
Forgot to commit it
|
11 years ago |
Montel Laurent
|
65bbaf602d
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kaddressbook/mainwidget.cpp
kaddressbook/merge/autotests/CMakeLists.txt
kaddressbook/merge/job/mergecontacts.cpp
kaddressbook/merge/job/mergecontacts.h
kaddressbook/merge/manualmerge/mergecontactsdialog.h
kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp
kmail/mailmerge/tests/CMakeLists.txt
kmail/mailmerge/widgets/mailmergewidget.h
|
11 years ago |