tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1283 commits 81 branches 117 tags 12 MiB
Commit graph

371 commits

Author SHA1 Message Date
Albert Vaca
04d5b12f8b Merge branch 'master' into sslrefactor 2016-06-01 12:20:07 +02:00
Albert Vaca
75e6e3b2f8 Runcommand can now execute commands with pipes and other shell constructs 2016-06-01 12:19:39 +02:00
Aleix Pol
5fcc0c9694 mpriscontrol doesn't send requests 2016-06-01 03:14:34 +02:00
Aleix Pol
8805fed666 mpriscontrol doesn't send requests 2016-06-01 01:14:20 +02:00
Albert Vaca
aca9cc0ed7 Notifications doesn't need kconf anymore 2016-05-31 18:13:37 +02:00
Aleix Pol
ea9c6330e9 Fix build after merge 2016-05-31 17:48:55 +02:00
Aleix Pol
9aa794b0da Merge branch 'master' into sslrefactor 2016-05-31 17:29:06 +02:00
Aleix Pol
e7578cc129 Refactor capabilities together with Albert 
He is committing a similar patch to kdeconnect-android
 2016-05-31 17:16:01 +02:00
Albert Vaca
3f82eb9cc7 Less verbose and more useful logging. 2016-05-25 14:33:58 -06:00
Albert Vaca
0b5fbe00bb Split plugins for sending and receiving notifications 
CCMAIL: holger.k@elberer.de
 2016-05-25 12:49:13 -06:00
Albert Vaca
932d8db6bc Changed name and action icon for find my phone plugin, plus added tooltip. 
Trying to make it more discoverable and less misleading (could look like
a gps-based tool).
 2016-05-25 11:51:48 -06:00
David Kahles
623ca94a0c Don't hardcode app name to filter notifications 
The app name used by KNotification is translated, and thus the filtering
doesn't work if the translated app name is different.

REVIEW: 127768
 2016-04-28 00:19:19 +02:00
Albert Vaca
0c95010c3b Merge branch 'master' into sslrefactor 
# Conflicts:
#	core/device.cpp
#	interfaces/devicesmodel.cpp
 2016-04-14 19:00:42 -07:00
l10n daemon script
ef488d10a8 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"
 2016-04-11 10:21:02 +00:00
l10n daemon script
05cc6fa131 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"
 2016-04-09 09:56:16 +00:00
David Kahles
337dd191e4 Fix mpris player discovery 
The previous used QDbusServiceWatcher doesn't work as it does only watch out
for specific services, but the players use different, unpredictable names, so
we need to check all service registrations for mpris players.

BUG: 361367
REVIEW: 127611
 2016-04-08 01:22:22 +02:00
David Kahles
aefa51fa86 Remove notifications from plasmoid, if the notifications plugin gets disabled 
Therefore notify the client that we're deleting all notifications.
Otherwise the client wouldn't notice this and the notifications would still
be available in the plasmoid.

REVIEW: 127582
 2016-04-06 02:30:50 +02:00
David Kahles
e86ea7b3bd Remove the keys from the notification hashmap 
When disabling the notifications plugin, we can't delete the notification
adapter due to a QT bug. Thus we leak it, and to not expose the notifications
anymore, we clean up the notifications in the adaptor. Therefore we delete
the QStrings in the notification hashmap (mNotifications) with qDeleteAll().
But this function does only free the QStrings, but no remove the keys from the
hashmap. Thus, a subsequent call to activeNotifications() has an undefined
behavior, as there are dangling pointers in the hashmap. This is solved by
removing the keys from the hashmap.

REVIEW: 127543
 2016-04-05 23:33:45 +02:00
Elias Probst
6b8595d418 Fix typo in debug msg (Batttery → Battery) 2016-03-24 23:47:55 +01:00
Albert Vaca
ff9775e1c9 Better logging of what's going on 2016-03-07 16:01:44 -08:00
Àlex Fiestas
5d80bf9f23 If the package contains a photo, show it in the notification 
If the received packet has a photo, set it as pixmap in the
notification, otherwise keep showing the icon.

REVIEW:127298
 2016-03-07 11:34:41 +01:00
l10n daemon script
6e17178c0f 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"
 2016-03-04 09:11:29 +00:00
l10n daemon script
c2ff5c5101 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"
 2016-03-03 09:54:08 +00:00
l10n daemon script
2c88a0ab39 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"
 2016-02-27 09:28:44 +00:00
l10n daemon script
1dbadf133a 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"
 2016-02-24 09:10:43 +00:00
l10n daemon script
5df0923b22 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"
 2016-02-22 10:51:54 +00:00
Albert Vaca
2f33fa0fc7 Hack to fix crash 2016-02-17 05:06:37 -08:00
Albert Vaca
a0deb776c1 Use passwords for sftp since Android doesn't have our pubkey anymore. 2016-02-17 04:51:28 -08:00
l10n daemon script
f6724de704 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"
 2016-02-14 09:18:22 +00:00
l10n daemon script
7f668b59a3 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"
 2016-02-13 09:43:43 +00:00
l10n daemon script
a9670e5a81 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"
 2016-02-12 09:32:36 +00:00
l10n daemon script
024c1d0860 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"
 2016-02-09 10:33:53 +00:00
l10n daemon script
770c356371 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"
 2016-02-08 13:39:47 +00:00
l10n daemon script
4b57abd556 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"
 2016-02-06 09:47:03 +00:00
l10n daemon script
5eb9a54bcc 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"
 2016-02-05 09:16:28 +00:00
Albert Vaca
95622ded12 Typo 
BUG: 358972
 2016-02-04 03:55:53 -08:00
l10n daemon script
9df0fc1e24 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"
 2016-01-31 09:40:47 +00:00
l10n daemon script
51e989f454 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"
 2016-01-23 10:32:56 +00:00
l10n daemon script
2b9217fab3 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"
 2016-01-17 10:49:15 +00:00
Holger Kaelberer
4b5bde4858 notifications: synchronize icons if possible and requested 
Configurably attach icons as payload to notification packages. By
design and due to restrictions on mobile devices *only* png is sent.
As KIconLoader preferably returns svg icons from iconPath() we fall
back to loading from "hicolor" using KIconTheme directly. Otherwise
*many* icons are dropped because of svg format.

This also improves slightly the test-case to use a tweaked TestDevice
to allow for inspecting sent NetworkPackage-s.

REVIEW: 126666
 2016-01-11 20:12:43 +01:00
l10n daemon script
36fff2276b 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"
 2016-01-11 13:02:16 +00:00
Albert Vaca
fa1771dd64 Merge branch 'master' into sslrefactor 2016-01-10 09:01:14 -08:00
Albert Vaca
3040b15f40 Fixed crash in Qt 
CCEMAIL: lamarque@kde.org
 2016-01-10 08:59:12 -08:00
Holger Kaelberer
548508d6e6 notifications: don't register proxied notifications internally 
REVIEW: 126645
 2016-01-07 13:22:10 +01:00
l10n daemon script
45d5068143 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"
 2016-01-05 13:22:15 +00:00
Albert Vaca
1d98bd3cbe Merge branch 'master' into sslrefactor 2016-01-02 12:58:12 -08:00
Albert Vaca
517c02451b Merge branch '0.9' 
# Conflicts:
#	kdeconnect.appdata.xml
#	plugins/mprisremote/kdeconnect_mprisremote.json
#	plugins/ping/kdeconnect_ping.json
#	plugins/remotecontrol/kdeconnect_remotecontrol.json
 2016-01-02 12:51:30 -08:00
Albert Vaca
36e62891ca This syntax also works on older OpenSSH versions. 
Like the one that Ubuntu distributes

BUG: 355015
 2016-01-02 12:45:18 -08:00
l10n daemon script
a0c1a57999 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"
 2015-12-30 09:23:05 +00:00
l10n daemon script
6434909e79 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"
 2015-12-29 11:22:52 +00:00