l10n daemon script
f607aeb488
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"
7 years ago
l10n daemon script
4503c42d37
GIT_SILENT made messages (after extraction)
7 years ago
David Faure
671da7dec6
Fix compilation with Qt 5.14
...
- no deprecated methods usage
- Qt now defined std::hash(QString)
7 years ago
Laurent Montel
532bd40758
GIT_SILENT: Prepare 5.12.2
7 years ago
l10n daemon script
e9120bc9e6
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"
7 years ago
Laurent Montel
1ed64bf406
Fix Bug 409662 - Missing "Save Attachments..." from Multiple Emails
...
FIXED-IN: 5.12.1
BUG: 409662
BUG: 392143
7 years ago
Laurent Montel
059c1b6d7b
GIT_SILENT: Prepare 5.12.1
7 years ago
l10n daemon script
46a46adaa2
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"
7 years ago
Laurent Montel
3a724812da
GIT_SILENT: Prepare 5.12.0
7 years ago
l10n daemon script
698035fc1e
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"
7 years ago
Laurent Montel
89bf5d1acb
Fix using correct parent widget.
...
Bug found by David: when we cancel printing in composer
it was given focus to mainwidget but not composer.
7 years ago
l10n daemon script
be08f7062b
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"
7 years ago
l10n daemon script
ba34f4b156
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"
7 years ago
l10n daemon script
e232414392
GIT_SILENT made messages (after extraction)
7 years ago
Laurent Montel
40e907b205
GIT_SILENT: Prepare 5.12.0
7 years ago
l10n daemon script
0bbef3a6d6
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"
7 years ago
Laurent Montel
02d705119f
GIT_SILENT: Prepare 5.12.0
7 years ago
Volker Krause
dcde6990cc
Adapt to KCalendarCore namespace change
7 years ago
l10n daemon script
245e17cbfa
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"
7 years ago
Laurent Montel
0d432e57ab
GIT_SILENT: Prepare 5.12.0 rc
7 years ago
l10n daemon script
79cb46cd6f
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"
7 years ago
l10n daemon script
e7098d489e
GIT_SILENT made messages (after extraction)
7 years ago
David Faure
c3f90f8a34
Cleanup now unused DBUS/Mailer code
7 years ago
l10n daemon script
fee4e49043
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"
7 years ago
David Faure
d910cd4e22
Check if KMail is running before calling it, to avoid autostarting it at kontact startup
7 years ago
David Faure
d3fe5ab1cf
Provide DBus activation file for kmail
...
Testcase: now this can be used to start kmail and wait until it registers to DBus:
$ qdbus org.kde.kmail
Longer term use case: KDBusServiceStarter can be ported to DBus
activation (in the far future).
7 years ago
David Faure
ffab00e6f1
Remove wrong use of DBUS/Mailer servicetype
...
(found by grepping)
7 years ago
Allen Winter
201eac97eb
summaryview_part.h - fix build by including QMap
7 years ago
Laurent Montel
0b987ab8d5
GIT_SILENT: Prepare 5.12.0 rc
7 years ago
Laurent Montel
43ce4f311a
Fix apps name
...
Bug reported by Jonathan Riddell
7 years ago
Laurent Montel
ec37c30f99
GIT_SILENT: Coding style
7 years ago
l10n daemon script
afbb0f0e32
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"
7 years ago
Laurent Montel
a5fcebf789
Remove tipofday group
7 years ago
Laurent Montel
75b4b9cd70
Reduce duplicate code
7 years ago
Laurent Montel
7a1cacdf25
Switch to next page when we finish clean up
7 years ago
Laurent Montel
cc3a978663
Clean up more settings
7 years ago
Laurent Montel
904b3ba562
Send info message to finish page
7 years ago
Laurent Montel
b8ceb92ada
Hide desktop file
7 years ago
l10n daemon script
836aef5aeb
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"
7 years ago
l10n daemon script
fe85527940
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"
7 years ago
Laurent Montel
d4175e5a8f
GIT_SILENT: Prepare 5.11.80 (19.08.0 beta)
7 years ago
Laurent Montel
408cd84a9b
GIT_SILENT: Increase dependancy as discussed in release-team@
7 years ago
l10n daemon script
4887ccb6f4
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"
7 years ago
Luigi Toscano
23d0ee34bf
Fix the capitalization of "KMail"
7 years ago
Laurent Montel
02a7cf28ce
GIT_SILENT: Prepare 5.11.80 (19.08.0 beta)
7 years ago
l10n daemon script
4b9cce52ba
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"
7 years ago
Laurent Montel
dcdef3d5c1
Add signal
7 years ago
Laurent Montel
040ba6b2c4
continue to implement cleanup folder settings
7 years ago
l10n daemon script
2e151a07f8
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"
7 years ago
Laurent Montel
2d904ee87d
Start to implement clean settings
7 years ago