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

1408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Albert Vaca
3040b15f40 Fixed crash in Qt 
CCEMAIL: lamarque@kde.org
 2016-01-10 08:59:12 -08:00
Albert Vaca
aa4150f0c9 Moved ConnectionStarted from DeviceLink to LanDeviceLink 2016-01-10 07:12:13 -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
860231a695 Fixed typo 2016-01-02 12:50:21 -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
l10n daemon script
49e74ea388 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-24 09:01:18 +00:00
l10n daemon script
446afc0619 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-21 09:59:24 +00:00
Albert Vaca
2aca5ca11e Added error message when trying to pair older devices 2015-12-17 09:24:34 -08:00
Aleix Pol
8a019ccddf Fix assert 2015-12-17 17:58:33 +01:00
Albert Vaca
7ed012e4a5 Fixed broadcast 2015-12-17 08:59:08 -08:00
Albert Vaca
ef6e403219 Fixed typo 2015-12-17 08:49:34 -08:00
Albert Vaca
f5404ea11b Removed more references to publicKey 2015-12-17 08:22:18 -08:00
Albert Vaca
918bb82ffa Do not store certificate and key in landevicelink 
The socket already stores the certificate, and the public key is only used
in the sftp plugin, so it should be moved there or dropped.
 2015-12-17 07:46:13 -08:00
Albert Vaca
4c84499e6a Don't addLink twice for the same link 2015-12-17 07:44:29 -08:00
Albert Vaca
dd7d4093ed Removed sendPackageEncrypted from DeviceLink 2015-12-17 07:43:52 -08:00
Albert Vaca
d37830b429 Simplified pairing logic 2015-12-17 06:54:29 -08:00
Albert Vaca
10b4ca00fb Set certificate in outgoing pairing packet 2015-12-17 06:53:57 -08:00
Albert Vaca
af43a21864 Propagate pairingError 2015-12-17 06:53:29 -08:00
Albert Vaca
1848e96a91 Fixed old signal name 2015-12-17 05:54:37 -08:00
Albert Vaca
49a24c258b Fixed crash 2015-12-17 05:54:24 -08:00
Albert Vaca
813c9fedb3 Calling setDeviceLink in pairing handler is not required anymore 
Since we re-use the same device link object forever now
 2015-12-17 04:41:53 -08:00
Albert Vaca
ddca4d6d63 Store and restore certificate and public key in lan link 2015-12-17 04:41:10 -08:00
l10n daemon script
0571275cd7 SVN_SILENT made messages (after extraction) 2015-12-14 11:35:25 +00:00
l10n daemon script
6e358c5638 SVN_SILENT made messages (after extraction) 2015-12-14 08:19:58 +00:00
l10n daemon script
4ec85ece76 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-12 09:25:35 +00:00
Albert Vaca
945da8a84f Removed encrypted package type define 2015-12-10 19:06:55 -08:00
Albert Vaca
79a8103120 Added some asserts 2015-12-10 19:06:55 -08:00
Albert Vaca
2e4c3762e9 Re-use landevicelink objects instead of re-creating one each time 2015-12-10 17:11:48 -08:00
l10n daemon script
1b76d2e84a 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-10 09:12:39 +00:00
l10n daemon script
4c06c63d39 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-09 09:05:00 +00:00
l10n daemon script
9e0af7e3ba SVN_SILENT made messages (.desktop file) 2015-12-08 12:52:29 +00:00
l10n daemon script
60f157a61f SVN_SILENT made messages (after extraction) 2015-12-08 11:14:00 +00:00
l10n daemon script
b8a351092d 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-08 10:05:27 +00:00
Albert Vaca
77facdbcfd Merge branch 'master' into sslrefactor 2015-12-07 03:38:06 -08:00
Albert Vaca
2e4ce90656 Commented out old encryption functions 2015-12-07 03:34:41 -08:00
Aleix Pol
42110549f4 Improve SharePlugin share notification method 
Make the share received notification explicitly internal.
Fix runtime warning about how QUrl cannot be exported.
Notify about all shares, not exclusively transferred files.
 2015-12-07 03:27:40 +01:00
Aleix Pol
70f55d0ebc Fix compilation and a couple of warnings 
CCMAIL: holger.k@elberer.de
 2015-12-07 03:21:35 +01:00
Aleix Pol
d69cdce4c1 Make sure incoming Lan pair packages are processed by the LanPairHandler 2015-12-06 02:12:29 +01:00
Aleix Pol
7041c72aed Fix connect 2015-12-06 02:11:50 +01:00
Aleix Pol
e10b2e80c9 Propagate pairing errors 2015-12-06 01:51:53 +01:00
Aleix Pol
90c8f588bc Only respond to local broadcasts 2015-12-06 01:19:55 +01:00
Aleix Pol
69d899ed48 Only broadcast when the newly reported configuration is actually active 2015-12-06 01:19:20 +01:00
Aleix Pol
97d97ffa1b Fix connect 2015-12-06 01:18:27 +01:00
Aleix Pol
a45e48ca7a Fix tests build 
Daemon::requestPairing changed into ::askPairingConfirmation.
 2015-12-06 00:08:02 +01:00
Holger Kaelberer
4fc39601dd tests: add test-case for NotificationsListener 2015-12-05 23:23:22 +01:00