Commits · master · Network / KIO GDrive

19 Jan, 2021 1 commit

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

Script Kiddy authored Jan 19, 2021

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"

4a89212e

18 Jan, 2021 1 commit

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

Script Kiddy authored Jan 18, 2021

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"

ea0eb7b2

17 Jan, 2021 1 commit

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

Script Kiddy authored Jan 17, 2021

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"

4bdcd387

16 Jan, 2021 1 commit

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

Script Kiddy authored Jan 16, 2021

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"

6f686bbe

15 Jan, 2021 2 commits
- Fix message extraction · cbc4f9e5
  Yuri Chornoivan authored Jan 15, 2021
  
  cbc4f9e5
- GIT_SILENT made messages (after extraction) · d958a1b8
  Script Kiddy authored Jan 15, 2021
  
  d958a1b8
12 Jan, 2021 1 commit

Allow uploading files to gdrive via Purpose · 5be7a416

Nicolas Fella authored Jan 12, 2021

This adds a plugin for Purpose that allows uploading files from apps that use Purpose like Dolphin, Okular, Gwenview, or Spectacle to GDrive.

5be7a416

09 Jan, 2021 1 commit

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

Script Kiddy authored Jan 09, 2021

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"

81207c73

04 Jan, 2021 1 commit

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

Script Kiddy authored Jan 04, 2021

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"

526f317b

02 Jan, 2021 1 commit
- GIT_SILENT Update Appstream for new release · b3dda8ed
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit 87937ed2)
```
  b3dda8ed
29 Dec, 2020 1 commit

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

Script Kiddy authored Dec 29, 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"

6a491ec9

07 Dec, 2020 1 commit

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

Script Kiddy authored Dec 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"

6dfecb3d

02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 5126ef15
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit e9030e5e)
```
  5126ef15
29 Nov, 2020 1 commit
- Remove unused include · 0b62adbb
  Nicolas Fella authored Nov 29, 2020
  
  0b62adbb
23 Nov, 2020 1 commit

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

Script Kiddy authored Nov 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"

7e535e40

18 Nov, 2020 1 commit

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

Script Kiddy authored Nov 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"

3d43059e

16 Nov, 2020 1 commit

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

Script Kiddy authored Nov 16, 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"

f4fc1601

14 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 42bfdb48
  Script Kiddy authored Nov 14, 2020
  
  42bfdb48
08 Nov, 2020 1 commit
- GIT_SILENT Upgrade release service version to 21.03.70. · 104095ad
  Albert Astals Cid authored Nov 08, 2020
  
  104095ad
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 15a18746
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit 3eb49f67)
```
  15a18746
28 Oct, 2020 1 commit

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

Script Kiddy authored Oct 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"

f781988d

09 Oct, 2020 1 commit

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

Script Kiddy authored Oct 09, 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"

8c4c8074

03 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 2a82f8c2
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit ac9d1677)
```
  2a82f8c2
01 Oct, 2020 1 commit

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

Script Kiddy authored Oct 01, 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"

3b4949d7

26 Sep, 2020 1 commit
- Drop unnecessary returns · 4b533ceb
  Elvis Angelaccio authored Sep 13, 2020
```
Since they are at the end of void functions.
```
  4b533ceb
21 Sep, 2020 1 commit

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

Script Kiddy authored Sep 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"

40122131

19 Sep, 2020 1 commit

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

Script Kiddy authored Sep 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"

8ca2e01f

18 Sep, 2020 1 commit

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

Script Kiddy authored Sep 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"

ec75a3b4

17 Sep, 2020 1 commit

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

Script Kiddy authored Sep 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"

7ce71029

14 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 5a1c09d6
  Script Kiddy authored Sep 14, 2020
  
  5a1c09d6
12 Sep, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5d3258a6
  Script Kiddy authored Sep 12, 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"
```
  5d3258a6
- GIT_SILENT made messages (after extraction) · d1dea6f3
  Script Kiddy authored Sep 12, 2020
  
  d1dea6f3
11 Sep, 2020 1 commit

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

Script Kiddy authored Sep 11, 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"

78366e38

10 Sep, 2020 1 commit

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

Script Kiddy authored Sep 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"

9c5d01b0

09 Sep, 2020 1 commit

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

Script Kiddy authored Sep 09, 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"

33816cb8

08 Sep, 2020 1 commit

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

Script Kiddy authored Sep 08, 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"

e320796c

06 Sep, 2020 2 commits
- Convert licenses to SPDX standard · 6321fda6
  Elvis Angelaccio authored Sep 06, 2020
  
  6321fda6
- Add "Open in browser" context menu action. · 0b1762e4
  David Barchiesi authored Aug 18, 2020
  
  0b1762e4
03 Sep, 2020 2 commits
- Use JSON metadata · cac51be2
  Elvis Angelaccio authored Aug 27, 2020
  
  cac51be2
- Add properties plugin for viewing Google Drive related information. · 5f5ae8dc
  David Barchiesi authored Jul 15, 2020
  
  5f5ae8dc