Commit graph

646 commits

Author SHA1 Message Date
l10n daemon script
75e432be04 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-09-07 09:08:43 +02:00
l10n daemon script
8d4db317a7 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-09-06 09:15:30 +02:00
l10n daemon script
8f14a64170 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-09-05 09:04:32 +02:00
l10n daemon script
0052781221 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-09-03 08:52:45 +02:00
l10n daemon script
01cef32d31 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-09-02 08:44:49 +02:00
l10n daemon script
c2d4424b8f 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-09-01 08:24:07 +02:00
l10n daemon script
e1632da278 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-08-31 08:47:03 +02:00
l10n daemon script
c81a4e730b 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-08-30 09:20:35 +02:00
l10n daemon script
8cbf92c8c8 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-08-08 08:27:09 +02:00
l10n daemon script
c52ee5f316 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-08-01 08:25:00 +02:00
l10n daemon script
3311074757 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-07-31 08:58:38 +02:00
l10n daemon script
086ceb6140 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-07-10 08:44:47 +02:00
l10n daemon script
e8459aeca8 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-07-05 08:31:03 +02:00
l10n daemon script
1c5b3d3bab 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-06-23 18:40:03 +02:00
l10n daemon script
41ef07492d 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-06-21 08:51:08 +02:00
Nicolas Fella
05b34fdcf5 Don't update new notifications 2019-06-17 23:29:44 +02:00
l10n daemon script
e1df67e878 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-06-09 08:22:23 +02:00
Nicolas Fella
f79a1c1c6d [sftp] Fix error message wording 2019-06-06 00:48:02 +02:00
Nicolas Fella
d1b20be4ec [sftp] Improve error reporting 2019-06-06 00:47:00 +02:00
l10n daemon script
3e20e0ec22 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-05-26 08:22:00 +02:00
l10n daemon script
7779292a82 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-05-25 08:42:30 +02:00
Nicolas Fella
c2a663691b Simplify notification handling
Summary:
Use QPointer for KNotification
Use ready signal for signalling updates

BUG: 400010

Test Plan: Spawned some notifications

Reviewers: #kde_connect, broulik, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D18354
2019-05-21 20:02:29 +02:00
l10n daemon script
2cff3fb405 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-05-08 08:49:45 +02:00
l10n daemon script
27179256fc 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-05-06 08:50:21 +02:00
l10n daemon script
3cdd01261a 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-05-04 08:50:26 +02:00
l10n daemon script
746e5c7eeb 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-05-01 09:04:39 +02:00
l10n daemon script
1d55c781fe 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-04-22 08:58:58 +02:00
l10n daemon script
87a8d00ddd 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-04-20 09:03:25 +02:00
Nicolas Fella
08fd50931b Don't show multiple windows when replying to a notification 2019-04-14 19:08:25 +02:00
l10n daemon script
3cb491041a 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-04-10 09:15:30 +02:00
l10n daemon script
2fc026b60d 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-04-08 08:42:38 +02:00
l10n daemon script
7de69a1a27 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-04-04 09:01:28 +02:00
l10n daemon script
6789967721 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-04-03 09:05:03 +02:00
l10n daemon script
80183cda73 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-04-02 09:00:27 +02:00
l10n daemon script
6ecad4d8b8 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-04-01 08:54:49 +02:00
l10n daemon script
b72a3e53f6 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-31 09:30:09 +02:00
Nicolas Fella
25a0045587 Fix build 2019-03-23 22:29:16 +01:00
Nicolas Fella
188adfbee7 Always play when call ended
Summary:
When the music is resumed during the call it was paused again when the call ends

Bug: 400787

Test Plan: Get called, resume music during call, check state after call

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D16809
2019-03-23 22:13:40 +01:00
Nicolas Fella
573ac40809 [sftp] Also report desktop side errors via KIO 2019-03-23 22:12:37 +01:00
David Faure
294c85f73a fix typo in slot name 2018-12-16 21:03:59 +01:00
Albert Vaca
8603592b59 It's DSS we want to enable
My previous commit changed it to RSA by mistake
2018-09-06 18:20:08 +02:00
Albert Vaca
0a58978cb8 Also allow modern algorithms, for compat with future apps 2018-09-06 18:20:07 +02:00
Albert Vaca
0fc98240c0 Remove characters from UUID that aren't legal in URLs 2018-09-06 18:20:07 +02:00
Nicolas Fella
ff29ad592f Fix DBus signals in Mprisremote
Summary: This seems to fix the issue I mentioned on Telegram/Mail

Test Plan:
Before: Use Mprisremote plugin with App. View did not update when e.g. next is pressed.
Now: View correctly represents the DBus data

Reviewers: #kde_connect

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12528
2018-09-06 18:19:24 +02:00
Albert Vaca
13830c601a Added -o reconnect to sshfs
It has been reported to fix some errors
2018-05-30 20:17:11 +02:00
Matthijs Tijink
33c2a100b1 Support file url album art - Desktop
Summary: If the android code sees a file url, and album art is needed, it will start a request to transfer the album art. This code does some sanity checks to prevent abuse and then transfers the album art.

Test Plan: Art is transferred succesfully.

Reviewers: #kde_connect, nicolasfella, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: nicolasfella, albertvaka

Differential Revision: https://phabricator.kde.org/D11017
2018-03-25 13:45:01 +02:00
Albert Vaca
22d14de018 Fix addNotification being called twice
It broke the notifications, which is probably a different bug

Reviewed by Albert Astals
2018-03-24 21:28:43 +01:00
Albert Vaca
da8f3d19d0 Do not start a second transfer if one is in progress
Reviewed by Albert Astals
2018-03-24 21:28:43 +01:00
Aleix Pol
47f6effe08 Introduce a Run command preset menu in the run command kcm
Summary:
It's a way for users to understand what it's supposed to do and offer
some useful features.

Reviewers: #kde_connect, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: mtijink

Differential Revision: https://phabricator.kde.org/D11656
2018-03-24 20:19:12 +01:00
Friedrich W. H. Kossebau
cfe83bb69d Revert accidental hard dependency on KF5Wayland 2018-03-22 17:34:15 +01:00