Commit graph

262 commits

Author SHA1 Message Date
l10n daemon script
71c5a1b248 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-01-06 05:29:27 +01:00
l10n daemon script
e36bf748cc 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"
2018-12-23 05:14:11 +01:00
l10n daemon script
590afee817 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"
2018-12-03 05:29:48 +01:00
l10n daemon script
baef9265d9 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"
2018-12-02 05:23:51 +01:00
l10n daemon script
38fed324bf 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"
2018-11-21 05:40:27 +01:00
l10n daemon script
50a94b26e8 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"
2018-11-16 05:48:33 +01:00
l10n daemon script
a3cce94666 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"
2018-11-06 05:56:05 +01:00
l10n daemon script
39c8603e54 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"
2018-11-05 05:36:20 +01:00
l10n daemon script
8d831d018b 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"
2018-11-04 06:02:51 +01:00
Nicolas Fella
e66817928f Actually include desktop file 2018-11-02 03:22:05 +01:00
Nicolas Fella
a53d99a8ad Thunar integration
Summary: Add desktop file for integration into Thunar

Test Plan: Run Thunar, Right-click file -> Send to -> Send via KDE Connect

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D16604
2018-11-02 03:21:03 +01:00
Nicolas Fella
9a56d7531b Add contract file
Summary:
This allows sending files from ElementaryOS apps such as their file manager.

Create a data dir for similar files

Test Plan: run contractor; run pantheon-files, right-click file -> Send via KDE Connect

Reviewers: #kde_connect

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D16603
2018-11-02 03:00:39 +01:00