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

1321 commits

This branch
This branch
All branches
Author SHA1 Message Date
l10n daemon script
99026c4e03 SVN_SILENT made messages (after extraction) 2015-11-07 15:38:52 +00:00
l10n daemon script
0b4d36546c SVN_SILENT made messages (.desktop file) 2015-11-04 19:54:08 +00:00
l10n daemon script
5d57029324 SVN_SILENT made messages (after extraction) 2015-11-04 18:30:25 +00:00
l10n daemon script
e424bcec1a 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-11-04 17:00:05 +00:00
l10n daemon script
ebdd1f29c8 SVN_SILENT made messages (after extraction) 2015-11-04 14:12:48 +00:00
l10n daemon script
5b712ef7c9 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-11-01 10:41:45 +00:00
l10n daemon script
49cc3294e6 SVN_SILENT made messages (.desktop file) 2015-10-28 12:40:23 +00:00
l10n daemon script
3fd1eb4d2f 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-10-28 10:17:04 +00:00
l10n daemon script
7bbd93c024 SVN_SILENT made messages (.desktop file) 2015-10-27 14:38:42 +00:00
l10n daemon script
2bf2f2bac6 SVN_SILENT made messages (after extraction) 2015-10-27 13:29:38 +00:00
l10n daemon script
633952b638 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-10-27 12:30:00 +00:00
l10n daemon script
0fa6cb17bc SVN_SILENT made messages (after extraction) 2015-10-27 09:49:38 +00:00
l10n daemon script
dda5ec5385 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-10-26 03:37:32 +00:00
l10n daemon script
9067649a8f SVN_SILENT made messages (after extraction) 2015-10-26 01:46:19 +00:00
l10n daemon script
4239b0525b 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-10-25 03:57:27 +00:00
Yuri Chornoivan
ff2940b07a Fix minor typo 2015-10-21 19:07:44 +03:00
Aleix Pol
2c53d8dcd4 Add some slightly more useful documentation 2015-10-21 03:00:17 +02:00
Aleix Pol
0bca50af93 Merge branch '0.9' 2015-10-19 17:48:13 +02:00
Albert Vaca
d2b4a6f214 Indentation 2015-10-18 21:51:51 -07:00
Albert Vaca
e2f068b286 Fixed a memory leak making the DownloadJob destroy itself on disconnect 
There are still some code paths where it doesn't get destroyed though,
like when the device gets unreachable (and the download socket doesn't
close for some reason).
 2015-10-18 21:51:51 -07:00
Albert Vaca
229e3aa070 Removed unused class 2015-10-18 19:42:40 -07:00
Aleix Pol
661fa098d4 Introduce bare documentation for the KDE Connect kcm 2015-10-19 03:25:17 +02:00
Albert Vaca
e4c5ea646e Added a link to the wiki from the KCM. 2015-10-18 15:08:36 -07:00
Albert Vaca
30f00fb3fa Fix a crash where unmount was called again after m_proc had been destroyed 
This happened because of scheduling m_proc->kill() from unmount 5 seconds
after the destructor was called (which was who called unmount first).

Simplified unmount logic a bit as well. Known bug: we might end with a fuse
mountpoint still mounted after killing the sshfs process.

BUG: 352861
 2015-10-17 17:31:17 -07:00
Albert Vaca
6deec3429a Use id instead of a pointer in the dismissRequested signal and slot. 
Also changed connection to the Qt5 way.
 2015-10-17 15:32:13 -07:00
Albert Vaca
4574aa3639 Make the origin also contain the file name, not only the device name 2015-10-17 13:32:57 -07:00
l10n daemon script
c0576f76b1 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-10-13 12:45:08 +00:00
l10n daemon script
c4a499ca01 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-10-12 10:38:12 +00:00
l10n daemon script
1a464d6384 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-10-06 12:36:45 +00:00
l10n daemon script
ef1ea618f3 SVN_SILENT made messages (after extraction) 2015-10-06 10:15:54 +00:00
l10n daemon script
9f291d9ef7 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-10-02 10:15:24 +00:00
l10n daemon script
bdc2ff9ee6 SVN_SILENT made messages (after extraction) 2015-10-02 08:09:38 +00:00
l10n daemon script
47ee991548 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-10-01 10:36:43 +00:00
l10n daemon script
44b356108a SVN_SILENT made messages (after extraction) 2015-09-30 07:59:33 +00:00
l10n daemon script
ba818c743c 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-29 12:23:45 +00:00
l10n daemon script
7d1ce74d94 SVN_SILENT made messages (after extraction) 2015-09-29 09:51:20 +00:00
l10n daemon script
b05a90f090 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-28 10:20:36 +00:00
l10n daemon script
170fdf5bd2 SVN_SILENT made messages (after extraction) 2015-09-28 08:21:12 +00:00
Albert Vaca
53e6381d30 Fixed warning about using pointers in slots 2015-09-26 08:23:55 -07:00
Albert Vaca
091de2ad4b Removed unused generate_export_header 2015-09-26 08:23:41 -07:00
Harald Sitter
66743cf11f do not runtime require Qt 5.5 for no good reason 
Layouts 1.2 appeared in Qt 5.5 [1] and introduced new fooMargin properties
[2]. We do however not use margins here, so we do not actually need
Layouts 1.2. Drop back down to Layouts 1.1 to be more compatible with
mainstream distros.

[1] http://doc.qt.io/qt-5.4/qtquick-layouts-qmlmodule.html
[2] http://doc.qt.io/qt-5.5/qml-qtquick-layouts-layout.html#bottomMargin-attached-prop

REVIEW: 125388
 2015-09-25 11:04:24 +02:00
l10n daemon script
f1cb1e42a2 SVN_SILENT made messages (after extraction) 2015-09-25 08:14:08 +00:00
l10n daemon script
f9db1e0fa5 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-22 12:23:31 +00:00
l10n daemon script
197e90586d SVN_SILENT made messages (after extraction) 2015-09-21 08:07:55 +00:00
l10n daemon script
d42bcb25a2 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-19 11:56:19 +00:00
l10n daemon script
708e49155f SVN_SILENT made messages (after extraction) 2015-09-19 09:10:00 +00:00
l10n daemon script
d33800a748 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-17 11:59:25 +00:00
l10n daemon script
410d1c9d4a SVN_SILENT made messages (after extraction) 2015-09-17 09:26:59 +00:00
l10n daemon script
c1c1166e09 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-16 10:24:01 +00:00
l10n daemon script
0c95e5a2db SVN_SILENT made messages (after extraction) 2015-09-16 08:16:15 +00:00