Commits · master · Network / KIO GDrive

05 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 7f82f722
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 6417fb18)
```
  7f82f722
28 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1ddc652d
  Script Kiddy authored Jul 28, 2020
```
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"
```
  1ddc652d
- GIT_SILENT made messages (after extraction) · 91d3a379
  Script Kiddy authored Jul 28, 2020
  
  91d3a379
23 Jul, 2020 1 commit

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

Script Kiddy authored Jul 23, 2020

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"

6aed3305

21 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e2cf6aeb
  Script Kiddy authored Jul 21, 2020
```
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"
```
  e2cf6aeb
- GIT_SILENT made messages (after extraction) · 28cb096e
  Script Kiddy authored Jul 21, 2020
  
  28cb096e
18 Jul, 2020 1 commit
- Merge branch 'release/20.08' · 2e976f34
  Elvis Angelaccio authored Jul 18, 2020
  
  2e976f34
13 Jul, 2020 2 commits
- Add a Qt version check on deprecated usage of split. · 3ebf4f34
  David Barchiesi authored Jul 08, 2020
  
  3ebf4f34
- Allow accessing a Shared Drive by name and cache harder · 86804cb4
  David Barchiesi authored Jul 13, 2020
  
  86804cb4
11 Jul, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.11.70. · d9b9f457
  Albert Astals Cid authored Jul 11, 2020
  
  d9b9f457
- GIT_SILENT Upgrade release service version to 20.07.80. · 083b14fe
  Albert Astals Cid authored Jul 11, 2020
  
  083b14fe
05 Jul, 2020 5 commits
- Port away from deprecated split usage. · bde3185c
  David Barchiesi authored Jul 05, 2020
  
  bde3185c
- Remove too aggressive hiding of deprecated KF API · 501b5886
  Friedrich W. H. Kossebau authored Jul 05, 2020
```
Also having developer & source-only builds see different API is risky and
not recommended.

GIT_SILENT
```
  501b5886
- Add missing const · 98539b9f
  Elvis Angelaccio authored Jul 05, 2020
  
  98539b9f
- Add latest stable release to appdata. · f04ac65a
  David Barchiesi authored Jun 16, 2020
  
  f04ac65a
- Port to RELEASE_SERVICE_VERSION automatic version · 123f73f1
  Elvis Angelaccio authored Jul 05, 2020
```
As kio-gdrive is now part of the release service.

CCMAIL: release-team@kde.org
```
  123f73f1
29 Jun, 2020 1 commit
- When listing a directory or stat()ing, make sure the account is present in accountsmanager. · 50791b8f
  David Barchiesi authored May 27, 2020
  
  50791b8f
28 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1f6d00fe
  Script Kiddy authored Jun 28, 2020
```
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"
```
  1f6d00fe
- GIT_SILENT made messages (after extraction) · a436fb83
  Script Kiddy authored Jun 28, 2020
  
  a436fb83
19 Jun, 2020 1 commit

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

Script Kiddy authored Jun 19, 2020

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"

1fcc7529

18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 242c41d8
  Script Kiddy authored Jun 18, 2020
```
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"
```
  242c41d8
- GIT_SILENT made messages (after extraction) · 46afa6f1
  Script Kiddy authored Jun 18, 2020
  
  46afa6f1
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 522596f4
  Script Kiddy authored Jun 17, 2020
```
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"
```
  522596f4
- GIT_SILENT made messages (after extraction) · 8e941bd9
  Script Kiddy authored Jun 17, 2020
  
  8e941bd9
10 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0df14bf8
  Script Kiddy authored Jun 10, 2020
```
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"
```
  0df14bf8
- GIT_SILENT made messages (after extraction) · 8d855ba4
  Script Kiddy authored Jun 10, 2020
  
  8d855ba4
02 Jun, 2020 1 commit

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

Script Kiddy authored Jun 02, 2020

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"

2532aebb

31 May, 2020 1 commit

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

Script Kiddy authored May 31, 2020

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"

c46c7c95

18 May, 2020 1 commit
- Port away from deprecated KRun::runUrl · 90d44bea
  Nicolas Fella authored May 18, 2020
```
Use the new OpenURLJob instead.

Builds, but untested
```
  90d44bea
30 Apr, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 4ac9376a
  Script Kiddy authored Apr 30, 2020
  
  4ac9376a
07 Apr, 2020 1 commit

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

Script Kiddy authored Apr 07, 2020

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"

9d36a5bc

06 Apr, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d8682848
  Script Kiddy authored Apr 06, 2020
```
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"
```
  d8682848
- GIT_SILENT made messages (after extraction) · 6e07c732
  Script Kiddy authored Apr 06, 2020
  
  6e07c732
05 Apr, 2020 2 commits
- Merge branch '1.3' · 14d94a9f
  Elvis Angelaccio authored Apr 05, 2020
  
  14d94a9f
- Bump master version · 6e6c278e
  Elvis Angelaccio authored Apr 05, 2020
  
  6e6c278e
04 Apr, 2020 3 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · fdb22114
  Script Kiddy authored Apr 04, 2020
```
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"
```
  fdb22114
- GIT_SILENT made messages (after extraction) · ce0ce30c
  Script Kiddy authored Apr 04, 2020
  
  ce0ce30c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6ba800d9
  Script Kiddy authored Apr 04, 2020
```
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"
```
  6ba800d9
02 Apr, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · bab892f9
  Script Kiddy authored Apr 02, 2020
```
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"
```
  bab892f9
- GIT_SILENT made messages (after extraction) · b6b844c8
  Script Kiddy authored Apr 02, 2020
  
  b6b844c8