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

1726 commits

This branch
This branch
All branches
Author SHA1 Message Date
l10n daemon script
e6f3b5bd27 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"
 2017-07-18 05:56:58 +02:00
l10n daemon script
6d4eecc3e1 GIT_SILENT made messages (after extraction) 2017-07-18 05:15:02 +02:00
l10n daemon script
d8c578edc9 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"
 2017-07-17 06:00:54 +02:00
l10n daemon script
028c8d8695 GIT_SILENT made messages (after extraction) 2017-07-17 05:19:15 +02:00
l10n daemon script
322fcd47a5 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"
 2017-07-16 06:03:07 +02:00
l10n daemon script
be30441da5 GIT_SILENT made messages (after extraction) 2017-07-16 05:21:28 +02:00
l10n daemon script
d513d9e37e 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"
 2017-07-15 05:39:16 +02:00
l10n daemon script
e09da05dcc GIT_SILENT made messages (after extraction) 2017-07-15 04:59:40 +02:00
l10n daemon script
cc43a72884 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"
 2017-07-14 05:43:50 +02:00
l10n daemon script
4d10aed047 GIT_SILENT made messages (after extraction) 2017-07-14 05:04:31 +02:00
Aleix Pol
d7ec24725f Make sure we keep track of changes when the device link changes 
Especially useful because it contains the announce name.

CCBUG: 364150
 2017-07-14 03:30:49 +02:00
Albert Vaca
f7b2cee995 Remove debug message 2017-07-14 02:17:59 +02:00
Aleix Pol
27876542ab Unpair whenever there's a QSSLError 2017-07-14 02:17:59 +02:00
Aleix Pol
209e3e2842 Reflect property change when unpairing 
There's no pairStatusChanged when the device is not connected to
anything (be it because it's unreachable at the moment).
 2017-07-14 01:01:15 +02:00
Albert Vaca
b67761a442 Remove debug messages 2017-07-14 00:32:40 +02:00
Albert Vaca
ebbf43f760 Coding style 2017-07-14 00:19:56 +02:00
Albert Vaca
83c250e9f1 Trust the name stored in the certificate 
Having a separate copy of it in the config leads to them not being in sync

BUG: 381542
 2017-07-14 00:19:26 +02:00
Fabian Vogt
0667c6556f Merge branch '1.x' 2017-07-12 11:37:41 +02:00
Fabian Vogt
5641d818dc Treat device names as plaintext, not rich text 
Summary:
Notifications, QML Text and QLabel accept a HTML subset,
which does not make sense for device names.

BUG: 382243

Test Plan:
Sent a pair request and accepted it, device name
now shown as plain text everywhere.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: #kde_connect

Differential Revision: https://phabricator.kde.org/D6640
 2017-07-12 11:33:21 +02:00
Nicolas Fella
732462135f Show no notification icon if there is no 
Summary: I think it looks nicer than the kind of angry default icon and is the expected behaviour

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, apol, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D6089
 2017-07-11 23:27:41 +02:00
Aleix Pol
29888cb78b Improve debug information 
If we're ignoring an ssl issue, at least show it.
On connected show whether the socket is valid, otherwise we get remote
devices disconnected without any message. (In this case HostNameMismatch)
Also fixes a typo

CCBUG: 381542
 2017-07-07 17:26:55 +02:00
l10n daemon script
a4c0a8fb96 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"
 2017-06-30 04:28:23 +02:00
Albert Vaca
e6248c0d1b Initial mousepad (remote input) plugin implementation for windows 2017-06-29 01:57:46 +02:00
l10n daemon script
bb3722b144 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"
 2017-06-28 08:22:58 +02:00
l10n daemon script
fbd7e6d383 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"
 2017-06-21 08:21:46 +02:00
l10n daemon script
ef1bee54e0 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"
 2017-06-20 05:46:09 +02:00
l10n daemon script
36269e6506 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"
 2017-06-20 04:26:54 +02:00
l10n daemon script
150062de6c GIT_SILENT made messages (after extraction) 2017-06-20 03:02:25 +02:00
l10n daemon script
720476bfd7 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"
 2017-06-19 04:17:01 +02:00
l10n daemon script
664fd443f0 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"
 2017-06-13 05:54:34 +02:00
l10n daemon script
06736423ed 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"
 2017-06-12 05:09:43 +02:00
l10n daemon script
858d7b0057 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"
 2017-06-11 04:30:27 +02:00
Aleix Pol
077bed106f Introduce a URL handler and offer handling tel:/// urls 
Summary: Makes it possible to handle tel urls with any KDE Connect device

Test Plan: Manual testing

Reviewers: #kde_connect, albertvaka, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D6120
 2017-06-09 13:42:16 +02:00
l10n daemon script
72162bf8c9 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"
 2017-06-08 04:52:02 +02:00
l10n daemon script
6305de985b 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"
 2017-06-06 04:28:16 +02:00
l10n daemon script
47b4aadaa3 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"
 2017-06-05 04:09:27 +02:00
l10n daemon script
f472243bae GIT_SILENT made messages (after extraction) 2017-06-05 02:53:29 +02:00
l10n daemon script
c070b4d445 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"
 2017-06-04 04:17:49 +02:00
Julian Wolff
8aaa18848e show icon and reply toolbutton in plasmoid 
Summary:
Show an icon for each notification which has an icon.

	Show a toolbutton which can be used to reply to notifications which offer a quick reply.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka

Maniphest Tasks: T4674, T4658

Differential Revision: https://phabricator.kde.org/D6058
 2017-06-01 16:17:45 +02:00
Julian Wolff
4eeb329014 These changes allow replying to any notifications that offer quick reply text fields 
Summary: These changes allow replying to any notifications that offer quick reply text fields

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: apol

Maniphest Tasks: T4674

Differential Revision: https://phabricator.kde.org/D5993
 2017-05-31 15:36:43 +02:00
l10n daemon script
ece098ac3b 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"
 2017-05-31 08:06:19 +02:00
l10n daemon script
78b91cf4c0 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"
 2017-05-30 05:29:21 +02:00
l10n daemon script
60fa493171 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"
 2017-05-30 04:17:47 +02:00
l10n daemon script
447d74bda4 GIT_SILENT made messages (after extraction) 2017-05-28 04:51:40 +02:00
Pino Toscano
9d968fa3ac Merge remote-tracking branch 'origin/1.x' 2017-05-27 06:29:30 +02:00
Pino Toscano
b6f280aedb tests: fix memory access in testnotificationlistener 
set the image data as QByteArray of the right size, otherwise
referencing a stack-based char data will be problematic when the
function is out of scope
 2017-05-27 06:14:00 +02:00
Pino Toscano
4bcb40906b fix appdata validation 
until there is a screenshot available, comment out the whole
<screenshots> tag, instead of leaving it with no <image> child nodes
 2017-05-27 05:45:10 +02:00
l10n daemon script
5fda0b61e6 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"
 2017-05-27 05:29:51 +02:00
l10n daemon script
155cb9f738 GIT_SILENT made messages (after extraction) 2017-05-27 04:52:15 +02:00
l10n daemon script
0d217c58e1 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"
 2017-05-27 04:22:53 +02:00