Commit graph

1839 commits

Author SHA1 Message Date
Kiril Vladimiroff
71f8357e00 Use compact format when saving runcommand commands
REVIEW: 130018
2017-03-17 12:26:10 +01:00
Yuxuan Shui
9af480163d Add keep alive options to sshfs.
REVIEW: 130015
2017-03-15 19:48:37 +01:00
Yuxuan Shui
0b3f0acde5 Fix files under sshfs being owned by root.
This patch sets uid/gid to the user running kdeconnectd.
2017-03-15 17:39:38 +01:00
Yuxuan Shui
353f2053e3 Automatically reconnect sftp
BUG: 377040
2017-03-15 11:35:36 +01:00
Yuxuan Shui
f2925b7661 Fix SFTP unmount
REVIEW: 129993
2017-03-15 11:34:49 +01:00
l10n daemon script
3ed53ea469 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-03-15 05:07:11 +01:00
l10n daemon script
17a6d1eaac 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-03-14 21:36:14 +01:00
l10n daemon script
12d322a0f9 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-03-09 07:52:59 +01:00
l10n daemon script
c9050ccfe1 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-03-09 06:05:20 +01:00
l10n daemon script
e31aad379f GIT_SILENT made messages (after extraction) 2017-03-09 03:53:29 +01:00
Albert Vaca
a4f2a60d47 Do not use the default proxy.
Qt uses the system proxy if set up, explicitly disable it.

BUG: 376187
2017-03-06 22:02:08 +01:00
l10n daemon script
4c81f980b6 GIT_SILENT made messages (after extraction) 2017-03-06 03:54:21 +01:00
l10n daemon script
df3d092def 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-03-05 06:58:38 +01:00
l10n daemon script
dfa780c8d8 GIT_SILENT made messages (after extraction) 2017-03-05 04:52:19 +01:00
Albert Vaca
636a4507cc Actually, just set the tooltip to the icon
The tooltip within the menus behaved weird, and didn't add any info.
2017-02-28 22:08:40 +01:00
Albert Vaca
44aec35996 Use the device name as tooltip 2017-02-28 22:04:20 +01:00
l10n daemon script
9d70774610 GIT_SILENT made messages (after extraction) 2017-02-27 03:52:26 +01:00
l10n daemon script
8950339129 GIT_SILENT made messages (after extraction) 2017-02-26 03:51:01 +01:00
Albert Vaca
7cc39aada8 Added an option to the cli to return your own device id 2017-02-24 22:37:22 +01:00
l10n daemon script
6a37a3c1bd GIT_SILENT made messages (after extraction) 2017-02-24 03:56:27 +01:00
l10n daemon script
5dfafab10b 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-02-23 08:12:30 +01:00
l10n daemon script
fc0dd3981d 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-02-23 06:10:12 +01:00
l10n daemon script
e8f6d05f19 GIT_SILENT made messages (after extraction) 2017-02-23 03:58:31 +01:00
l10n daemon script
d518688d6f GIT_SILENT made messages (after extraction) 2017-02-22 03:46:07 +01:00
l10n daemon script
7b758183ad GIT_SILENT made messages (after extraction) 2017-02-21 08:45:47 +01:00
Albert Vaca
51e4116886 Fixed crash 2017-02-21 00:08:03 +01:00
Aleix Pol
1cbc067205 Remove disabled plugins
No need to show it's not available
2017-02-20 23:27:42 +01:00
Aleix Pol
a000f82475 Remove unpair from the indicator menu
It's never an urgent action, should be done from the KCM
2017-02-20 23:27:03 +01:00
Aleix Pol
dc607617f3 Introduce screenshots on AppStream
Fixes appstreamtest
2017-02-20 22:59:46 +01:00
Aleix Pol
0669526346 Use the same description as android's on AppStream metadata 2017-02-20 22:49:50 +01:00
Aleix Pol
f65392ca6b Expose pair requests on the KCM 2017-02-20 21:00:26 +01:00
Albert Vaca
b75d52fe31 Do not use a location under home as mount point
Try to use XDG_RUNTIME_DIR and fall back to /tmp.

https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2017-02-18 16:14:51 +01:00
Albert Vaca
1b308a547d Fix warning because of missing enum value in switch 2017-02-18 15:32:55 +01:00
Albert Vaca
2c1c8525e5 Now a 100% more compiling 2017-02-14 23:03:59 +01:00
Albert Vaca
25e0cea373 Make error message reflect the actual ports we use 2017-02-14 22:52:37 +01:00
l10n daemon script
16526b39a7 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-02-11 07:56:00 +01:00
l10n daemon script
8c6f7582e2 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-02-11 06:03:33 +01:00
Albert Vaca
f0a96a3ab9 Do not error if we try to request pair again 2017-02-10 00:54:03 +01:00
Albert Vaca
5f0173f469 Added a comment
Ubuntu's Unity doesn't support persistent notifications and it shows a
popup dialog instead :/
2017-02-08 14:59:34 +01:00
Albert Vaca
bc0b182708 Name of the app 2017-02-08 14:58:31 +01:00
Kai Uwe Broulik
e9af490553 Merge branch '1.x' 2017-02-07 22:03:15 +01:00
Kai Uwe Broulik
54d43cebcb [Applet] Make "no device available" heading consistent with other applets
Also ensure that it wraps instead of overflowing in case the text gets too long on translated system.

Differential Revision: https://phabricator.kde.org/D4478
2017-02-07 22:02:38 +01:00
l10n daemon script
4049df63b3 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-02-06 05:59:30 +01:00
Albert Vaca
7e63a90da6 Merge branch '1.x'
# Conflicts:
#	app/org.kde.kdeconnect.app.desktop
#	plugins/kdeconnect.notifyrc
#	plugins/remotecommands/kdeconnect_remotecommands.json
#	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
2017-02-05 16:12:25 +01:00
Albert Vaca
12a3027be6 Wrong order, condition was always false. 2017-02-05 16:08:20 +01:00
Albert Vaca
1d09ee78a5 Naming 2017-02-05 15:54:38 +01:00
l10n daemon script
bf97d8f606 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-02-05 06:01:50 +01:00
l10n daemon script
ba17222da5 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-02-03 07:59:01 +01:00
l10n daemon script
805c813537 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-02-03 06:09:47 +01:00
l10n daemon script
268f9fa5fd 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-02-02 05:53:43 +01:00