Laurent Montel
bd6d72f744
QString::remove operates on the same object, no need to reassign
7 years ago
Laurent Montel
049c80dca2
Use QLatin1String overload for QString::operator ==/!=
7 years ago
Laurent Montel
34ceef8838
Use QLatin1String in join/startswith/endsWith/contains + QString::replace operates on the same object, no need to reassign
7 years ago
Laurent Montel
4978684161
Move spellchecker config in own class + save/load size
7 years ago
l10n daemon script
278ad845eb
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
97585dd99b
Add info about kde release version too.
7 years ago
Laurent Montel
145eac478d
GIT_SILENT: coding style
7 years ago
Laurent Montel
d4845e085f
Use class which was moved in messagecomposer
7 years ago
l10n daemon script
3f3b9c3d36
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
8ffb47ba03
Merge remote-tracking branch 'origin/Applications/19.08'
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
Laurent Montel
043001e4f6
Execute method
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
c122c6307e
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
f900fc9bea
Clean up dialog size settings too
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
l10n daemon script
595d119937
GIT_SILENT made messages (after extraction)
7 years ago
Laurent Montel
b3494a9f63
GIT_SILENT: Update dependancy
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
l10n daemon script
dd641f9cae
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
59c47d4280
Merge branch 'Applications/19.08'
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
l10n daemon script
f3c17e11bb
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
1969453765
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
l10n daemon script
625552bce0
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
21d6eca4d8
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
d12cdedfe8
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
60f4a19643
Merge remote-tracking branch 'origin/Applications/19.08'
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
l10n daemon script
f69f6ccaf6
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
d965fd84ad
Merge branch 'Applications/19.08'
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
fa0b49bfa2
Merge branch 'Applications/19.08'
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
c42ef6f0de
Merge remote-tracking branch 'origin/Applications/19.08'
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
d2fc2fee12
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago
Laurent Montel
43ce4f311a
Fix apps name
...
Bug reported by Jonathan Riddell
7 years ago
Allen Winter
28a8cf907b
summaryview_part.h - fix build by including QMap
7 years ago
Laurent Montel
d630da46aa
Merge remote-tracking branch 'origin/Applications/19.08'
7 years ago