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

1570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleix Pol
eb31c1e152 Make it possible to toggle full notification contents by clicking on it 
REVIEW: 129087
 2016-10-04 01:12:04 +02: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
76677c65c3 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 09:59:23 +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
7ac6543c61 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 09:37:19 +00: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
l10n daemon script
04165fef38 SVN_SILENT made messages (after extraction) 2016-09-29 11:00:15 +00:00
Albert Vaca
54aa41d57f Merge branch '1.x' 2016-09-29 11:02:12 +02:00
Albert Vaca
68158ed548 Removed old file 2016-09-29 11:02:03 +02:00
Albert Vaca
d49d8d4784 Merge branch '1.x' 
# Conflicts:
#	plugins/telephony/kdeconnect_telephony.json
 2016-09-29 11:01:02 +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
83eaf6a932 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-27 10:24:42 +00:00
l10n daemon script
8dd4f04f97 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-26 09:25:33 +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
l10n daemon script
776c7a81a6 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 09:28:23 +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
Albert Vaca
f61dde5bbb Use different files instead of different groups 2016-09-19 13:35:03 +02:00
Albert Vaca
96bca486b1 Increased version number to release 2016-09-19 13:32:12 +02: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
Luigi Toscano
c6fba2fbf8 Merge remote-tracking branch 'origin/1.x' 2016-09-16 17:20:11 +02:00
Luigi Toscano
b732263d7a appdata file: add URL to documentation 2016-09-16 17:10:00 +02:00
Luigi Toscano
10c74fad81 Rename the appdata file (namespace) and install it 
- change the name of the appdata file to match the name of the desktop
  file (with the namespace). Maybe the .kcm.desktop is not the
  more appropriate, but we can fix this later.
- actually install the appdata file.
- fix the value of project_group (basically the umbrella community/project).
 2016-09-16 16:54:59 +02: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
Kai Uwe Broulik
77ad9336b6 [FileTransferJob] Fix division by null and use elapsed timer 
When sending multiple files from my phone to my PC, kdeconnectd usually received a SIGFPE.
To get the transfer speed it divides the number of bytes received by the elapsed time which can be zero.

Also, since we're only interested in the time that has elapsed, use QElapsedTimer,
which is exactly for this. QTime::elapsed() also needs to take into account potentially
ocurred timezone or DST changes.

REVIEW: 128861
 2016-09-10 22:52:03 +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
Albert Vaca
dd40598a62 Fixed plasmoid not closing when clicked again 
BUG: 364473
 2016-09-06 10:53:19 +02:00
Albert Vaca
faaf60c8f4 Changed 'ring my phone' icon as a question mark was confusing 2016-09-06 10:53:19 +02:00
Albert Vaca
b585e4d48a Don't return an empty list of supported plugins 
If we don't know it yet return them all.
 2016-09-06 10:53:19 +02:00
Albert Vaca
3c0f3b9814 Removed unsupported plugins section from KCM 2016-09-06 10:53:19 +02:00
Antonio Rojas
5b26635348 Use KDE_INSTALL_FULL_LIBEXECDIR in kdeconnectd.desktop template 
This always translates to the correct path, while ${LIBEXEC_INSTALL_DIR} gives the wrong Exec=lib/kdeconnectd if KDE_INSTALL_LIBEXECDIR=lib.

REVIEW: 128607
 2016-09-03 10:45:45 +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
l10n daemon script
1952357ba6 SVN_SILENT made messages (after extraction) 2016-08-30 07:38:42 +00:00
Albert Vaca
5ad007a981 Merge branch '1.x' 2016-08-29 20:46:48 +02:00
Thmoas Posch
a759cdf678 Device::encryptionInfo returned the entire certificate instead of the hash 
BUG: 367897
 2016-08-29 20:41:06 +02:00
Albert Vaca
2fd42a8408 Unused var 2016-08-29 20:38:16 +02:00
Albert Vaca
d89bf512cf We should always emit an entry for "." 
Note this doesn't fix the bug yet, as the KIO just redirects to the SSHFS,
which happens to have the same problem.

BUG: 367878
 2016-08-29 20:31:52 +02:00
Albert Vaca
152c6dccb9 Calling processedSize is not needed in listDir 2016-08-29 20:28:24 +02:00
Albert Vaca
c9cfac7253 Remove debug logs 2016-08-29 11:00:35 +02:00