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

1213 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleix Pol
f65a1f206f Turn core qWarnings into qCWarning 2015-09-07 19:35:07 +02:00
Aleix Pol
91351773fd Mark incompatible plugins as such in the kcm 
If a plugin isn't available, display it as unsupported by the device. This
is figured out through capabilities.

Reviewed by Albert Vaca
 2015-09-07 19:35:07 +02:00
David Edmundson
c37cc90762 Merge branch 'stable' 2015-09-07 18:30:21 +02:00
David Edmundson
6a7edf5f44 Fix literal %1 in i18n 2015-09-07 18:26:50 +02:00
Aleix Pol
661d4579fc Merge branch 'stable' 2015-09-07 17:45:33 +02:00
Andreas Sturmlechner
1423000b44 Make tests optional 
This patch makes it able to disable building tests by choice or unavailability of Qt5Test (by example of kwin).

REVIEW: 122984
 2015-09-07 17:42:37 +02:00
Martin Gräßlin
cc148cea89 Setup KDeclarative before loading the Qml file 
Otherwise methods injected into the engine by KDeclarative are not
available in the loaded qml.

REVIEW: 124419
 2015-09-07 17:42:19 +02:00
Martin Gräßlin
e462c386cf Adjust application name to match desktop file 
The desktop file is called org.kde.kdeconnect.app - this needs to
be respected in the application name. This is a requirement to match
application windows to applications on Wayland. With a not-matching
name the compositor is not able to show a window icon.

REVIEW: 124418
 2015-09-07 17:40:50 +02:00
Aleix Pol
61f357a512 Fix regression 
Reviewed by Albert Vaca
 2015-09-07 17:12:28 +02:00
Aleix Pol
d835d01a09 Add a test for file sending, using the loopback device 
Extends unit testing by making sure that file sharing works locally.

REVIEW: 125086
 2015-09-07 15:03:04 +02:00
Aleix Pol
d41eab2fae add i18n for consistency 2015-09-07 15:03:04 +02:00
l10n daemon script
8859aa7dc3 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-09-07 09:52:48 +00:00
Albert Vaca
f35ce9c16f Trying to fix a couple of crashes when unpairing and repairing devices. 2015-09-07 00:14:52 -07:00
Albert Vaca
9837cf012d More descriptive name for menu entries for non-kde desktops. 2015-09-06 15:45:34 -07:00
Albert Vaca
faeee2119b Merge branch 'master' of github.com:albertvaka/kdeconnect-kde 2015-09-02 11:37:43 -07:00
l10n daemon script
e6a759a071 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-09-01 12:31:29 +00:00
Albert Vaca
784cd4ec0a Merge pull request #5 from rahiel/patch-1 
fix link in readme
 2015-08-30 07:51:57 -07:00
Rahiel Kasim
da28f92264 fix link in readme 
the link had an extra ]
 2015-08-30 13:55:03 +02:00
Rex Dieter
2b34d28d6f more validation fixes 2015-08-26 08:29:34 -05:00
Rex Dieter
d187dc5beb fix NotShowIn, "Plasma" is not valid or used 2015-08-26 07:12:05 -05:00
Rex Dieter
b930a905f2 use LIBEXEC_INSTALL_DIR consistently (without CMAKE_INSTAL_PREFIX) 2015-08-26 07:01:35 -05:00
Albert Vaca
bc3fb512d4 Fixed incompatibility with OpenSSH 7.0 
BUG: 351725
 2015-08-24 21:27:24 -07:00
Vineet Garg
78e9c08732 Merge branch 'master' into ssl 
Conflicts:
	core/backends/lan/socketlinereader.h
	core/backends/lan/uploadjob.h
	core/networkpackage.h
 2015-08-25 03:43:41 +05:30
Vineet Garg
17da38e5ba Explicity using TLSv1 because using AnyProtocol causes a default TLSv1.2 handshake which not supported on older android version 
Was using QueryPeer instead of VerifyPeer of isDeviceTrusted of connected slot
 2015-08-25 01:14:24 +05:30
Boris Egorov
1924173df2 Fix various krazy2 warnings 
Fix following krazy2 warning types:
[explicit], [endswithnewline], [doublequote_chars], [includes], [normalize],
[postfixop], [spelling]

See http://ebn.kde.org/krazy/reports/playground/base/kdeconnect-kde/index.html
for details.

SLOT/SIGNAL normalization done with Qt normalize utility:
https://github.com/qtproject/qtrepotools/tree/master/util/normalize

REVIEW: 124857
 2015-08-21 22:38:54 +06:00
Vineet Garg
9799c629d2 Added device test 2015-08-20 23:15:12 +05:30
Vineet Garg
44c0ec1c78 If remote device certificate is changes, in sslError due to simulataneous multiple connections, unpair was called on null pointer 2015-08-17 20:04:41 +05:30
Vineet Garg
eff84a49d4 We support any protocol instead of TLSv1.2 2015-08-16 21:19:56 +05:30
Vineet Garg
9bc93b6337 We generate certificate from present date -1 year to present date + 10 year, this avoids the case where certificate is not valid due to difference of time zones 2015-08-14 17:50:58 +05:30
Vineet Garg
75bd15ed65 Added default value while checking for link name in pairing handler, this provides backward compatibility 2015-08-14 17:33:08 +05:30
Vineet Garg
6fe1399a18 Fixed minor issues in pairing handler 2015-08-13 14:56:28 +05:30
Vineet Garg
c5a399b94b Fixed code identation issue 2015-08-12 23:49:15 +05:30
Vineet Garg
c2e8441c67 Merge branch 'master' into pairinghandler 2015-08-12 23:44:11 +05:30
Vineet Garg
6acb4204a2 Added KdeConnectConfigTest, TestSslSocketLineReader, LanLinkProviderTest 2015-08-12 23:42:27 +05:30
l10n daemon script
ce354aae44 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-08-11 13:21:00 +00:00
Vineet Garg
cf3d37b504 Fixed issue pointed out on RR 
Fixed some pairing handler issues
 2015-08-11 09:04:02 +05:30
l10n daemon script
f3411bb8dd 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-08-10 10:15:07 +00:00
Aleix Pol
a2aa2ab72b Fix qml touchpad interface 
On release, forget about the last position
 2015-08-07 15:02:36 +02:00
Aleix Pol
84f93ad0b5 Eh... copypaste 2015-08-07 15:02:06 +02:00
l10n daemon script
6dc0c048e2 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-08-06 10:23:02 +00:00
l10n daemon script
43161b3932 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-08-01 10:37:53 +00:00
Àlex Fiestas
886787f732 Set a valid url for UDS_URL, basically one that includes files:// 
In Qt5 QUrl need to be created by calling fromLocalFile to handle
paths such /root/foo.txt.
So KIO apparently broke compatibility with setting such paths in
UDS_URL and we have to pass instead files:///root/foo.txt

Altought this might be a bug in KIO, we want to work with all KF5 based
versions of plasma and this patch will just do that.

REVIEW:124544
 2015-07-31 13:01:24 +02:00
Àlex Fiestas
4acfaa8b12 Remove trailing spaces and lines 2015-07-31 11:39:58 +02:00
l10n daemon script
a0aa62dd04 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-07-29 09:16:57 +00:00
Vineet Garg
06d8b3c54e Merge branch 'master' into pairinghandler 2015-07-27 21:00:05 +05:30
Vineet Garg
2824e73617 Pairing handler implemented 2015-07-27 20:58:58 +05:30
l10n daemon script
b37582308a 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-07-26 09:31:02 +00:00
Vineet Garg
27515546a0 Now per device per link type pairing handlers are there 2015-07-25 17:15:19 +05:30
l10n daemon script
121b6ee64a 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-07-25 11:30:20 +00:00
l10n daemon script
bf51ceb600 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-07-24 09:52:53 +00:00