Commits · a00069f7d18562f20f5033bcc96e4537cf92eae1 · Network / KIO Extras

16 Nov, 2016 1 commit
- We actually need 5.7 of QWebEnginePage · a00069f7
  Albert Astals Cid authored Nov 16, 2016
```
Because of contentsSize
```
  a00069f7
15 Nov, 2016 2 commits
- Merge remote-tracking branch 'origin/Applications/16.08' · c61cf42a
  Christoph Feck authored Nov 15, 2016
  
  c61cf42a
- SVN_SILENT made messages (.desktop file) - always resolve ours · ee096d1a
  Script Kiddy authored Nov 15, 2016
```
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"
```
  ee096d1a
14 Nov, 2016 1 commit

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

Script Kiddy authored Nov 14, 2016

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"

d84fec16

12 Nov, 2016 2 commits

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

Script Kiddy authored Nov 12, 2016

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"

2c76d30c

Remove trash kcm docbook from kio-extras · f7a6bc87

Burkhard Lück authored Nov 12, 2016

the trash kcm docbook will be imported from kde-runtime master with history into frameworks/kio where the code is, see https://git.reviewboard.kde.org/r/128912/
this docbook was imported into kio-extras with https://cgit.kde.org/kio-extras.git/commit/doc/kcontrol/trash/index.docbook?id=09cd27cca7daa2339960efa0ab852ad492b5ac97 but why?
REVIEW:129377

f7a6bc87

10 Nov, 2016 1 commit

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

Script Kiddy authored Nov 10, 2016

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"

574b1cd9

09 Nov, 2016 2 commits

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

Script Kiddy authored Nov 09, 2016

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"

2b321c8d

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

Script Kiddy authored Nov 09, 2016

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"

f963e4bc

08 Nov, 2016 1 commit

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

Script Kiddy authored Nov 08, 2016

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"

fc28b452

07 Nov, 2016 3 commits
- [htmlcore] Port to QtWebEngine · 6dccc773
  Anthony Fieroni authored Nov 07, 2016
```
REVIEW: 129348

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
```
  6dccc773
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6e8704ff
  Script Kiddy authored Nov 07, 2016
```
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"
```
  6e8704ff
- [filenamesearch] Add kded module to watch file changes · 0c9abdaf
  Anthony Fieroni authored Nov 07, 2016
```
REVIEW: 129297

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
```
  0c9abdaf
03 Nov, 2016 1 commit

kio_mtp: improve warning message · e5619efa

Elvis Angelaccio authored Nov 03, 2016

This warning can appear also when MTP is disabled on the phone's side,
regardless of whether the phone has been unlocked.

REVIEW: 128793

e5619efa

31 Oct, 2016 2 commits
- readd X-DocPath again, we have an ioslave docbook · 31bbc44b
  Burkhard Lück authored Oct 31, 2016
  
  31bbc44b
- add docbook for recentdocuments ioslave · b4f67400
  Burkhard Lück authored Oct 31, 2016
```
REVIEW:129198
BUG:370573
```
  b4f67400
21 Oct, 2016 3 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2e48fc8f
  Script Kiddy authored Oct 21, 2016
```
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"
```
  2e48fc8f
- Add the updated (and correct) mimetype names for comicbook archives · 887b8e9a
  Dan Leinir Turthra Jensen authored Oct 21, 2016
```
See also https://bugs.freedesktop.org/show_bug.cgi?id=97688
```
  887b8e9a
- SVN_SILENT made messages (.desktop file) - always resolve ours · c85d598f
  Script Kiddy authored Oct 21, 2016
```
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"
```
  c85d598f
15 Oct, 2016 1 commit
- Comment out some ancient debug output from the thumbnail protocol handler · 6ea0ad9a
  Martin Tobias Holmedahl Sandsmark authored Oct 15, 2016
  
  6ea0ad9a
12 Oct, 2016 1 commit

remove DocPath entry from recentdocuments.protocol file · 43c912d2

Burkhard Lück authored Oct 12, 2016

with the DocPath entry this ioslave listed in khelcenter
but we have no docbook, so remove it from khc for now
CCBUG:370573

43c912d2

16 Sep, 2016 1 commit

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

Script Kiddy authored Sep 16, 2016

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"

ae90bdbc

10 Sep, 2016 1 commit
- Replace with KF5 equivalents · c643baf0
  Christoph Feck authored Sep 10, 2016
  
  c643baf0
09 Sep, 2016 2 commits

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

Script Kiddy authored Sep 09, 2016

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"

b99956b8

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

Script Kiddy authored Sep 09, 2016

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"

b43dedd3

18 Aug, 2016 1 commit

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

Script Kiddy authored Aug 18, 2016

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"

92bcd867

17 Aug, 2016 2 commits

Merge remote-tracking branch 'origin/Applications/16.08' · 800b4e33
Albert Astals Cid authored Aug 17, 2016

800b4e33

Pass MTP_INCLUDE_DIR to include_directories when trying to link against libmtp · c6fe1d17

Tobias Berner authored Aug 17, 2016 and

Albert Astals Cid committed Aug 17, 2016

cmake/FindMtp.cmake defines MTP_INCLUDE_DIR, yet it is not used while trying
to link against libmtp in mtp/CMakeLists.txt. This makes it fail with
| /wrkdirs/usr/ports/devel/kio-extras/work/kio-extras-15.12.0/mtp/devicecache.h:32:10: fatal error: 'libmtp.h' file not found
| #include <libmtp.h>

This patch passes it to include_directories, thereby fixing the build on FreeBSD.

REVIEW: 126599

c6fe1d17

15 Aug, 2016 1 commit
- Fix suspicious condition (assignment + comparison) · c7049eb7
  David Binderman authored Aug 15, 2016 and Christoph Feck committed Aug 15, 2016
```
BUG: 366763
Reviewed by Christoph Feck
```
  c7049eb7
30 Jul, 2016 1 commit

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

Script Kiddy authored Jul 30, 2016

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"

e1bed3f5

28 Jul, 2016 2 commits

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

Script Kiddy authored Jul 28, 2016

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"

32b7e09a

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

Script Kiddy authored Jul 28, 2016

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"

78d8682c

04 Jul, 2016 1 commit

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

Script Kiddy authored Jul 04, 2016

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"

d1a6eac9

25 Jun, 2016 1 commit

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

Script Kiddy authored Jun 25, 2016

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"

c906b43e

13 Jun, 2016 1 commit

Use QIcon for loading icon for folder thumbnail for consistensy · cfcb9f75

Martin Tobias Holmedahl Sandsmark authored Jun 12, 2016

When using e. g. Dolphin, which uses QIcon, the thumbnails for folders
would be inconsistent with the normal folder icons.

BUG: 364253
REVIEW: 128164

cfcb9f75

29 May, 2016 1 commit

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

Script Kiddy authored May 29, 2016

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"

5a05b039

17 May, 2016 1 commit

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

Script Kiddy authored May 17, 2016

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"

3d109795

16 May, 2016 2 commits
- Merge remote-tracking branch 'origin/Applications/16.04' · 7523aa7a
  Albert Astals Cid authored May 17, 2016
  
  7523aa7a
- fish: Fix bug with directories having a non-latin1 name · 1876df2e
  Fabien Shum-King authored May 17, 2016 and Albert Astals Cid committed May 17, 2016
```
REVIEW: 127941
BUGS: 357870
```
  1876df2e
29 Apr, 2016 1 commit

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

Script Kiddy authored Apr 29, 2016

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"

19604e59