Kai Uwe Broulik
fc16adda8d
[Service Runner] Remove context checks in the loops
...
Before the loops we already exit if the context isn't valid
10 years ago
Kai Uwe Broulik
00593d47e0
[Service Runner] Search for Jump List Actions
...
This makes the service runner find also additional actions provided by applications,
eg. "big picture" now finds Steam's "Big Picture" mode which isn't a separate application
service but instead an action on the main application.
Differential Revision: https://phabricator.kde.org/D1504
10 years ago
l10n daemon script
00506521cd
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"
10 years ago
l10n daemon script
8f91754a6e
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"
10 years ago
l10n daemon script
f832bd6225
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"
10 years ago
l10n daemon script
fa6e627a0d
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"
10 years ago
l10n daemon script
cd16765764
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
fb94287beb
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"
10 years ago
l10n daemon script
29da9a1a3a
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"
10 years ago
l10n daemon script
0b794f091a
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"
10 years ago
l10n daemon script
fe2bf1f84b
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"
10 years ago
l10n daemon script
16a3402428
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"
10 years ago
l10n daemon script
8517232757
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"
10 years ago
Sebastian Kügler
43f61342c8
"Runner" is jargon, don't show it in the UI
10 years ago
l10n daemon script
f9893549ba
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"
10 years ago
l10n daemon script
60a62124c4
SVN_SILENT made messages (.desktop file)
10 years ago
Aleix Pol
96ff1c868e
Properly define overrides as suggested by the c++ standard
10 years ago
Kai Uwe Broulik
5611b9cf2c
[Baloo Runner] Strip filename from subtext
...
The main text is already the filename
10 years ago
Kai Uwe Broulik
cc5ac26687
[Baloo Runner] Create QMimeDatabase only once
...
Not for every iteration
10 years ago
Kai Uwe Broulik
a18be0a6e6
[Baloo Runner] Allow opening parent folder
...
Since the "Open file manager window job" is not yet finished, this only opens the folder
without highlighting the actual file which will hopefully be added in Plasma 5.7
BUG: 340302
FIXED-IN: 5.6.0
Differential Revision: https://phabricator.kde.org/D904
10 years ago
Aleix Pol
d19b942775
Drop usage of Qt4Support
...
Where KDELibs4Support is not being used.
REVIEW: 126994
10 years ago
Kai Uwe Broulik
25dab5d872
[Baloo Runner] Add mime data to matches
...
Allows to drag and drop around found files.
BUG: 249621
Differential Revision: https://phabricator.kde.org/D908
10 years ago
l10n daemon script
5435e568df
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"
10 years ago
l10n daemon script
5836e35732
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
625089cd44
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"
10 years ago
l10n daemon script
278ba70509
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b2173723ce
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"
10 years ago
l10n daemon script
c1da8f1f86
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"
10 years ago
l10n daemon script
9a04a838e5
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
66f97694fc
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"
10 years ago
l10n daemon script
608648aa05
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
36b2d40cae
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"
10 years ago
l10n daemon script
8180c50abd
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
3973041666
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"
10 years ago
l10n daemon script
0e35c812b0
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"
10 years ago
l10n daemon script
3453aa8aa0
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"
10 years ago
l10n daemon script
40f0461650
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"
10 years ago
Weng Xuetian
0ab0823d8c
Fix krunner crash when open "/"
...
path.split may return empty string list if path contains only separator,
check the result before access it with last().
REVIEW: 126060
BUG: 355290
FIXED-IN: 5.5.0
10 years ago
Bhushan Shah
4414b99dca
Remove kscreenlocker code from the plasma-workspace
...
It got moved to new repo under kde:kscreenlocker
Reviewed-By: Martin Gräßlin
11 years ago
l10n daemon script
ed0ce07ac5
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
b87767969a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
aadd4b5683
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
Montel Laurent
a007f294b4
Use new connect api + QStringLiteral
11 years ago
l10n daemon script
80c1c7eada
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
d3277e8269
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
Martin Gräßlin
a3d252574d
Fix broken testChromeBookmarks
...
The test aborted because it had code executed before the QGuiApplication
was created which needs a QGuiApplication. The fix is to delay the
initialization into initTestCase.
11 years ago
l10n daemon script
ef8e9abb33
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
6635cdc956
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
4207c67625
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
4dbb05ac96
SVN_SILENT made messages (.desktop file)
11 years ago