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

441 commits

Author SHA1 Message Date
l10n daemon script
3be06839a8 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-10-11 13:08:45 +00:00
l10n daemon script
969c5d1a98 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-10-07 12:01:02 +00:00
l10n daemon script
cee1f7f144 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-10-05 11:58:34 +00:00
l10n daemon script
c055f7ffd2 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-10-04 12:55:54 +00:00
l10n daemon script
22358ef3eb 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-10-02 12:01:19 +00:00
l10n daemon script
5575caa21b 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-10-01 12:41:22 +00:00
l10n daemon script
7734ac25d2 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-09-30 12:08:02 +00:00
Thomas Posch
91cf466ee2 Sort commands by name, as we do on Android 
BUG: 369239
REVIEW: 129076
 2016-09-30 12:56:27 +02:00
l10n daemon script
ec0ca3976d 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-09-29 12:27:06 +00:00
Albert Vaca
68158ed548 Removed old file 2016-09-29 11:02:03 +02:00
Albert Vaca
d6355ab0ce Detect left handed mouse configurations and swap faked buttons 
BUG: 368953
 2016-09-29 10:54:33 +02:00
Albert Vaca
0dbaceafa3 Merge branch 'master' into 1.x 
# Conflicts:
#	plugins/battery/kdeconnect_battery.json
#	plugins/clipboard/kdeconnect_clipboard.json
#	plugins/findmyphone/kdeconnect_findmyphone.json
#	plugins/kdeconnect.notifyrc
#	plugins/lockdevice/kdeconnect_lockdevice.json
#	plugins/mousepad/kdeconnect_mousepad.json
#	plugins/mpriscontrol/kdeconnect_mpriscontrol.json
#	plugins/mprisremote/kdeconnect_mprisremote.json
#	plugins/notifications/kdeconnect_notifications.json
#	plugins/pausemusic/kdeconnect_pausemusic.json
#	plugins/ping/kdeconnect_ping.json
#	plugins/remotecommands/kdeconnect_remotecommands.json
#	plugins/remotecontrol/kdeconnect_remotecontrol.json
#	plugins/runcommand/kdeconnect_runcommand.json
#	plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
#	plugins/sendnotifications/kdeconnect_sendnotifications.json
#	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
#	plugins/sftp/kdeconnect_sftp.json
#	plugins/share/kdeconnect_share.json
#	plugins/telephony/kdeconnect_telephony.json
 2016-09-29 10:53:29 +02:00
Aleix Pol
7a94e26162 Attempt to better explain what the plugin does 
REVIEW: 129060
 2016-09-28 15:43:55 +02:00
l10n daemon script
167fd6cf59 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-09-28 11:51:45 +00:00
l10n daemon script
0423d6e5f7 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-09-25 12:01:18 +00:00
Albert Vaca
4cd190b86d Merge branch '1.x' 2016-09-24 20:35:57 +02:00
Albert Vaca
5435b0f9fb Removed outdated text 2016-09-23 17:37:20 +02:00
l10n daemon script
a8834dcbc3 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-09-21 11:54:11 +00:00
Albert Vaca
e97107156b Ignore user config as it might cause our connection to fail 
BUG: 369098
 2016-09-20 11:32:50 +02:00
l10n daemon script
c7cc056e13 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-09-19 11:44:07 +00:00
l10n daemon script
e884c4a9ac 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-09-18 09:32:51 +00:00
l10n daemon script
36f672beb8 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-09-14 11:52:55 +00:00
l10n daemon script
2d56c59386 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-09-14 09:17:50 +00:00
Kai Uwe Broulik
6f7c419baa Merge branch '1.x' 2016-09-10 22:53:37 +02:00
Albert Vaca
c19f26a95d Fixed clipboard propagation loop bug 
BUG: 362596
 2016-09-09 16:18:56 +02:00
Albert Vaca
36ed8080a9 Do not send back the clipboard to the same device which send it to us 2016-09-09 15:37:17 +02:00
l10n daemon script
2664b99864 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-08-30 10:03:14 +00:00
Albert Vaca
5ad007a981 Merge branch '1.x' 2016-08-29 20:46:48 +02:00
Holger Kaelberer
c122312c65 sendnotifications: also sync icon-data from notfication hints 
According to the priorities defined in the notifications spec
version 1.2

REVIEW: 126722
 2016-08-27 13:59:25 +02:00
Saikrishna Arcot
8f4d39424a MPRIS: Send info about whether certain actions are allowed. 
So the remote side can then disable some actions as necessary.

REVIEW: 128271
 2016-08-26 11:11:07 +02:00
l10n daemon script
1e574d18e3 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-08-19 09:28:59 +00:00
l10n daemon script
8a2c59d5d7 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-08-14 11:54:14 +00:00
l10n daemon script
83c20daf30 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-08-13 12:14:28 +00:00
l10n daemon script
3215661fec 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-08-11 12:17:31 +00:00
l10n daemon script
89b61e03f5 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-08-10 11:53:40 +00:00
l10n daemon script
2058cbc1af 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-08-08 11:56:08 +00:00
l10n daemon script
fa1233b051 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-08-06 12:40:34 +00:00
l10n daemon script
9788f8f96b 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-08-05 11:37:14 +00:00
l10n daemon script
ae766f5839 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-08-04 12:30:52 +00:00
Albert Vaca
5933c6810c More unused includes cleanup 2016-07-05 14:27:53 +02:00
Albert Vaca
308a89f5ea playerList was sometimes sent as null since this change (maybe when empty?) 
Reverted to the previous, saner, syntax.
 2016-06-26 17:11:08 +02:00
Albert Vaca
c154d9702b Only return if telepathy actually handles the message 2016-06-26 15:48:37 +02:00
Albert Vaca
e896449e74 Moved telepathy component to its own repo: telepathy-kdeconnect 2016-06-26 15:48:37 +02:00
l10n daemon script
60c3bf9b90 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-06-22 16:33:04 +00:00
Albert Vaca
7af35b00f2 Send sms to a number, not a contact name. Use the contact name for display. 
CCMAIL: david@davidedmundson.co.uk
 2016-06-22 14:27:31 +02:00
Albert Vaca
9939b58df0 Merge telephonyplugin and telepathy plugin 
We now use the telepathy interface when it's available, and fall back to
our custom dialog when it's not. This also makes the kdeconnect telepathy
connection manager be completely decoupled from the kdeconnect code.

CCMAIL: david@davidedmundson.co.uk
 2016-06-22 14:27:09 +02:00
Aleix Pol
49713d8aca Enforce Qt-specific keywords 
Reviewed by Albert Vaca
 2016-06-21 20:19:14 +02:00
Aleix Pol
f9406e8afc Introduce QVariantMap as an argument of NetworkPackage 
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.

Also port whenever possible to the initializer-list syntax.

REVIEW: 128269
 2016-06-21 20:07:12 +02:00
Albert Vaca
4dde19c8cc Added missing license header 2016-06-21 19:57:07 +02:00
Albert Vaca
17f18f0686 Fixed dbus-activation of telepathy connection manager service 2016-06-21 19:56:52 +02:00