Commits · 633952b63882c4740e8e29197fe3d7c376995774 · Weixuan Xiao / kdeconnect-kde

27 Oct, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 633952b6
  Script Kiddy authored Oct 27, 2015
```
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"
```
  633952b6
- SVN_SILENT made messages (after extraction) · 0fa6cb17
  Script Kiddy authored Oct 27, 2015
  
  0fa6cb17
26 Oct, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · dda5ec53
  Script Kiddy authored Oct 26, 2015
```
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"
```
  dda5ec53
- SVN_SILENT made messages (after extraction) · 9067649a
  Script Kiddy authored Oct 26, 2015
  
  9067649a
25 Oct, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4239b052

Script Kiddy authored Oct 25, 2015

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"

4239b052

21 Oct, 2015 2 commits
- Fix minor typo · ff2940b0
  Yuri Chornoivan authored Oct 21, 2015
  
  ff2940b0
- Add some slightly more useful documentation · 2c53d8dc
  Aleix Pol Gonzalez authored Oct 21, 2015
  
  2c53d8dc
19 Oct, 2015 5 commits
- Merge branch '0.9' · 0bca50af
  Aleix Pol Gonzalez authored Oct 19, 2015
  
  0bca50af
- Indentation · d2b4a6f2
  Albert Vaca Cintora authored Oct 18, 2015
  
  d2b4a6f2
- Fixed a memory leak making the DownloadJob destroy itself on disconnect · e2f068b2
  Albert Vaca Cintora authored Oct 18, 2015
```
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).
```
  e2f068b2
- Removed unused class · 229e3aa0
  Albert Vaca Cintora authored Oct 18, 2015
  
  229e3aa0
- Introduce bare documentation for the KDE Connect kcm · 661fa098
  Aleix Pol Gonzalez authored Oct 19, 2015
  
  661fa098
18 Oct, 2015 2 commits

Added a link to the wiki from the KCM. · e4c5ea64
Albert Vaca Cintora authored Oct 18, 2015

e4c5ea64

Fix a crash where unmount was called again after m_proc had been destroyed · 30f00fb3

Albert Vaca Cintora authored Oct 17, 2015

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

30f00fb3

17 Oct, 2015 2 commits
- Use id instead of a pointer in the dismissRequested signal and slot. · 6deec342
  Albert Vaca Cintora authored Oct 17, 2015
```
Also changed connection to the Qt5 way.
```
  6deec342
- Make the origin also contain the file name, not only the device name · 4574aa36
  Albert Vaca Cintora authored Oct 17, 2015
  
  4574aa36
13 Oct, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c0576f76

Script Kiddy authored Oct 13, 2015

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"

c0576f76

12 Oct, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c4a499ca

Script Kiddy authored Oct 12, 2015

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"

c4a499ca

06 Oct, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1a464d63
  Script Kiddy authored Oct 06, 2015
```
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"
```
  1a464d63
- SVN_SILENT made messages (after extraction) · ef1ea618
  Script Kiddy authored Oct 06, 2015
  
  ef1ea618
02 Oct, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9f291d9e
  Script Kiddy authored Oct 02, 2015
```
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"
```
  9f291d9e
- SVN_SILENT made messages (after extraction) · bdc2ff9e
  Script Kiddy authored Oct 02, 2015
  
  bdc2ff9e
01 Oct, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 47ee9915

Script Kiddy authored Oct 01, 2015

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"

47ee9915

30 Sep, 2015 1 commit
- SVN_SILENT made messages (after extraction) · 44b35610
  Script Kiddy authored Sep 30, 2015
  
  44b35610
29 Sep, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ba818c74
  Script Kiddy authored Sep 29, 2015
```
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"
```
  ba818c74
- SVN_SILENT made messages (after extraction) · 7d1ce74d
  Script Kiddy authored Sep 29, 2015
  
  7d1ce74d
28 Sep, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b05a90f0
  Script Kiddy authored Sep 28, 2015
```
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"
```
  b05a90f0
- SVN_SILENT made messages (after extraction) · 170fdf5b
  Script Kiddy authored Sep 28, 2015
  
  170fdf5b
26 Sep, 2015 2 commits
- Fixed warning about using pointers in slots · 53e6381d
  Albert Vaca Cintora authored Sep 26, 2015
  
  53e6381d
- Removed unused generate_export_header · 091de2ad
  Albert Vaca Cintora authored Sep 26, 2015
  
  091de2ad
25 Sep, 2015 2 commits

do not runtime require Qt 5.5 for no good reason · 66743cf1

Harald Sitter authored Sep 25, 2015

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

66743cf1

SVN_SILENT made messages (after extraction) · f1cb1e42
Script Kiddy authored Sep 25, 2015

f1cb1e42

22 Sep, 2015 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f9db1e0f

Script Kiddy authored Sep 22, 2015

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"

f9db1e0f

21 Sep, 2015 1 commit
- SVN_SILENT made messages (after extraction) · 197e9058
  Script Kiddy authored Sep 21, 2015
  
  197e9058
19 Sep, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d42bcb25
  Script Kiddy authored Sep 19, 2015
```
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"
```
  d42bcb25
- SVN_SILENT made messages (after extraction) · 708e4915
  Script Kiddy authored Sep 19, 2015
  
  708e4915
17 Sep, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d33800a7
  Script Kiddy authored Sep 17, 2015
```
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"
```
  d33800a7
- SVN_SILENT made messages (after extraction) · 410d1c9d
  Script Kiddy authored Sep 17, 2015
  
  410d1c9d
16 Sep, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c1c1166e
  Script Kiddy authored Sep 16, 2015
```
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"
```
  c1c1166e
- SVN_SILENT made messages (after extraction) · 0c95e5a2
  Script Kiddy authored Sep 16, 2015
  
  0c95e5a2