Alexander Lohnau
13a394cc17
Port msits kioslave to JSON metadata
...
Task: https://phabricator.kde.org/T14518
The JSON file was created using the protocoltojson utility from KIO.
5 years ago
Alexander Lohnau
16f70bb2a7
Remove Description property for kioslave
...
This value is never read in KIO and not exposed in the public API.
5 years ago
Alexander Lohnau
8b13d989c6
Clean up ServiceType property usage for JSON based plugins
...
This is no needed anymore, because the plugins are installed into a
specific dir. It is a leftover from the time where the ServiceTypes were
used to find the correct plugins.
Task: https://phabricator.kde.org/T14483
5 years ago
Heiko Becker
5941247354
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 1898bd2bec )
5 years ago
Heiko Becker
1898bd2bec
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
74c92306b8
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"
5 years ago
Heiko Becker
e6dae5d4f9
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8bdc851688 )
5 years ago
Heiko Becker
8bdc851688
GIT_SILENT Update Appstream for new release
5 years ago
Albert Astals Cid
3f923aa7b5
Move to new appstream format for mimetypes
...
It seems using mimetypes+mimetype is bad and now you have to use
provides+mediatype
5 years ago
Heiko Becker
5044a63cd4
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5951fc2731 )
5 years ago
Heiko Becker
5951fc2731
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
1c97e60dbd
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2aff8958b1 )
5 years ago
Heiko Becker
2aff8958b1
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
256ad59705
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
45a50b2d81
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
ee40297976
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"
5 years ago
l10n daemon script
4161fec216
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"
5 years ago
l10n daemon script
f16b767057
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"
5 years ago
Albert Astals Cid
35590a273d
Fix CI
...
Laurent please use MR like everyone else does, otherwise you break the
build for the rest of us.
CCMAIL: montel@kde.org
5 years ago
Laurent Montel
dd1938755e
Don't include QtTest as it includes all QtCore includes
5 years ago
l10n daemon script
a61977aa8a
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"
5 years ago
l10n daemon script
33483a10fa
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
c9440a9160
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"
5 years ago
l10n daemon script
a752711872
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
02c3bd691a
GIT_SILENT Update Appstream for new release
5 years ago
Laurent Montel
486e05b270
If include is define in .h remove it if it's defined in .cpp too (scripted)
5 years ago
l10n daemon script
dc74ffa68c
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"
5 years ago
l10n daemon script
6abe9fcdfd
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
6a31bfc7e3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0abdab924d )
6 years ago
Christoph Feck
0abdab924d
GIT_SILENT Update Appstream for new release
6 years ago
l10n daemon script
601e96037c
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"
6 years ago
l10n daemon script
21647201c2
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"
6 years ago
Albert Astals Cid
4085181512
UDSEntry::insert -> UDSEntry::fastInsert
...
we're clearing the UDSEntry just before the inserts so it's safe to
assume we're not inserting something that was there already
6 years ago
Christoph Feck
b3101774cf
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4b9e50a1ed )
6 years ago
Christoph Feck
4b9e50a1ed
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
f6ce4a57d8
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
d0b9d83946
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f6ce4a57d8 )
6 years ago
l10n daemon script
36a6010c4f
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"
6 years ago
l10n daemon script
8563aa45cb
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"
6 years ago
l10n daemon script
3ef3de28c8
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"
6 years ago
Albert Astals Cid
19d98d6a74
Run clang-format
...
find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format -i {} \;
If you reached this file doing a git blame, please see README.clang-format (added 2 commits in the future of this one)
6 years ago
Albert Astals Cid
2ed253a540
Include fixes
6 years ago
Laurent Montel
516fb89d94
Use camelcase include. (scripted)
6 years ago
Christoph Feck
182e2791d7
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 13dc58655a )
6 years ago
l10n daemon script
7254c56886
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"
6 years ago
l10n daemon script
e5f4a0d6da
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
90502b2961
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"
6 years ago
l10n daemon script
f046034c69
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
1f50b2a6b4
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"
6 years ago
l10n daemon script
c8fee988f4
GIT_SILENT made messages (after extraction)
6 years ago