Montel Laurent
c50ebfe895
improve migration
11 years ago
Montel Laurent
7f688ea42f
Migrate folders
11 years ago
Montel Laurent
ffa5f6ebf0
As usual compile is not tested...
...
I am tired to fix after each commit...
Please test full compile please !
CCMAIL: Sandro Knauß <knauss@kolabsys.com>
11 years ago
Sandro Knauß
93730b4ef5
Merge branch 'master' of git://anongit.kde.org/kdepim
11 years ago
Montel Laurent
a7758f3116
Allow to migrate apps
11 years ago
Montel Laurent
c69feb46b4
Add class to migrate folder too
11 years ago
Sandro Knauß
c48a242703
Merge branch 'master' of git://anongit.kde.org/kdepim
11 years ago
Sandro Knauß
69a6f61b78
Merge branch 'dev/kolab/merge/messageviewer-kf5'
...
Conflicts:
messageviewer/CMakeLists.txt
messageviewer/autotests/noteedittest.h
messageviewer/job/createeventjob.cpp
messageviewer/viewer/viewer.cpp
messageviewer/viewer/viewer_p.cpp
messageviewer/viewer/viewer_p.h
messageviewer/widgets/eventedit.cpp
messageviewer/widgets/todoedit.cpp
11 years ago
Montel Laurent
c173926279
Rename class to allow to use in all kdepim apps
11 years ago
Sandro Knauß
04caaca824
Merge branch 'master' of git://anongit.kde.org/kdepim
11 years ago
Sandro Knauß
052639ac05
Merge branch 'dev/kolab/merge/kmail-kf5'
11 years ago
Sandro Knauß
a85f28d9d0
Merge branch 'dev/kolab/merge/korganizer-kf5'
11 years ago
Montel Laurent
6d26ad5618
Emit signal when migrate is done
11 years ago
Montel Laurent
444b4cd616
Allow to define currentApplicationVersion
11 years ago
Montel Laurent
c91c2f2772
Implement checkIfNecessary
11 years ago
Montel Laurent
6272a28071
improve it
11 years ago
Montel Laurent
bed396af93
Improve migration
11 years ago
Montel Laurent
d1183a89c2
Astyle kdelibs
11 years ago
Sandro Knauß
1e5d4fd554
Merge branch 'dev/kolab/merge/korganizer' into dev/kolab/merge/korganizer-kf5
...
REVIEW: 123624
REVIEW: 123625
11 years ago
Montel Laurent
ffb4ba6fe4
Add i18n
11 years ago
Montel Laurent
b93292e143
Add more test
11 years ago
Montel Laurent
79745eede9
Add more autotest
11 years ago
Montel Laurent
42fb83114b
improve it
11 years ago
Montel Laurent
28c4f549bc
Move in own directory
11 years ago
Montel Laurent
70ea5e94bd
improve autotest
11 years ago
Montel Laurent
7239c4715c
Improve it
11 years ago
Montel Laurent
00dbab2dc0
Create autotests
11 years ago
Montel Laurent
77e43effb0
Make compile
11 years ago
Montel Laurent
70c82d9bd5
We need to migrate some data
11 years ago
Montel Laurent
f7f4588a70
AStyle kdelibs
11 years ago
Montel Laurent
07e75a5c1c
Don't link with kdelibs4support
11 years ago
Montel Laurent
5b27aa68b5
Readd margin
11 years ago
Montel Laurent
2dc8c18be6
Fix setDefaultShortcut
11 years ago
Montel Laurent
d6aca7049e
Use -qwindowtitle %c
11 years ago
Dan Vrátil
95bcb39412
KMail: fix queryClose() always returning true
...
KConfigGui::sessionConfig() always returns a valid pointer, so the condition
would always be true, which caused KMail to terminate whenever the main window
was closed (even when systray was enabled).
qApp->isSavingSession() is the right way to tell whether session saving is
in progress (even if we handle it by our own config).
11 years ago
Dan Vrátil
bc56033e7a
KMail: Remove now invalid -caption option from .desktop file
...
-caption used to work wit KApplication, but is no longer available, which caused
QCommandLineParser to interpret -caption as "-c aption", so starting KMail via
KRunner (or simply through the .desktop file) always started composer instead of
KMail main window.
11 years ago
Dan Vrátil
e74be249e2
Merge branch 'dev/no-kuniqueapplication'
...
Adapt PIM applications to changes in KontactInterface (porting away from
KUniqueApplication)
REVIEW: 123774
11 years ago
Montel Laurent
d75738aac3
Merge remote-tracking branch 'origin/KDE/4.14'
...
Conflicts:
kmail/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
11 years ago
Montel Laurent
3d06346c6a
Fix check potential phising
11 years ago
Montel Laurent
ac68a59a48
remove not necessary lib
11 years ago
Montel Laurent
a0ecfb84d6
Astyle kdelibs
11 years ago
Montel Laurent
41a3fdfd49
Reduce dependancy
11 years ago
Volker Krause
a1512998e2
Remove some unnecessary dependencies.
11 years ago
Montel Laurent
796cec07af
Merge remote-tracking branch 'origin/KDE/4.14'
...
Conflicts:
agents/folderarchiveagent.desktop
korgac/korgacagent.desktop
messageviewer/autotests/gravatarconfigwidgettest.cpp
messageviewer/widgets/gravatarconfigwidget.cpp
messageviewer/widgets/gravatarconfigwidget.h
11 years ago
l10n daemon script
a9f10334e5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
11 years ago
l10n daemon script
a77425c5e8
SVN_SILENT made messages (.desktop file)
11 years ago
Montel Laurent
2db1aff256
don't detach
11 years ago
Montel Laurent
0e8a6cbe29
Merge remote-tracking branch 'origin/KDE/4.14'
...
Conflicts:
CMakeLists.txt
kmail/configuredialog/configurecomposerpage.cpp
kmail/configuredialog/configurecomposerpage.h
libkdepim/addressline/addresslineedit/addresseelineedit.cpp
11 years ago
Volker Krause
c6af59f8ab
Prepare for reducing the link interface of KF5::AkonadiCore.
...
With all the unnecessary stuff removed from there we need to link against
a lot more things explicitly.
Also, while at it, remove a few unused dependencies of libkdepim.
11 years ago
Montel Laurent
4916b6c2af
Fix spacing
11 years ago