Nicolas Fella
3b8fedea1a
Replace http GNU urls with https
2019-03-23 17:29:26 +01:00
l10n daemon script
633b08d83e
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"
2019-03-23 06:07:48 +01:00
Nicolas Fella
9190c79203
Avoid detach
2019-02-28 14:24:25 +01:00
l10n daemon script
1d3368532a
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"
2019-02-26 05:29:15 +01:00
Nicolas Fella
7970e3d1c4
[Runners] Use icon name
...
Summary: `QIcon` isn't thread-safe and here we just pass a theme icon name anyway, so we can have the runner UI do the work as needed.
Test Plan: Compiles
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D19158
2019-02-21 11:48:46 +01:00
l10n daemon script
f5ac506835
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"
2019-02-16 05:37:45 +01:00
l10n daemon script
7634e82637
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"
2019-02-15 05:34:24 +01:00
l10n daemon script
2742f786d0
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"
2019-02-13 05:52:00 +01:00
l10n daemon script
af1ab23e0a
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"
2019-02-12 05:40:56 +01:00
l10n daemon script
12865f44f7
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"
2019-02-11 05:29:21 +01:00
l10n daemon script
9d3fe2cba0
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"
2019-02-10 05:23:38 +01:00
Nicolas Fella
e298b73f8e
Find my phone runner
...
Summary: Allows ringing devices from KRunner
Test Plan: Enter find, ring, or device name, activate entry
Reviewers: #kde_connect, #plasma, broulik, davidedmundson, apol
Reviewed By: #kde_connect, apol
Subscribers: sredman, apol, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D14607
2019-02-08 23:59:42 +01:00
