Commits · release/20.04 · Graphics / Kipi Plugins

12 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 785dce6c
  Script Kiddy authored Jul 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"
```
  785dce6c
- GIT_SILENT made messages (after extraction) · 49927e1a
  Script Kiddy authored Jul 12, 2020
  
  49927e1a
07 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 08d563aa
  Script Kiddy authored Jul 07, 2020
  
  08d563aa
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b2614d2f
  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"
```
  b2614d2f
- GIT_SILENT made messages (after extraction) · f36a42ec
  Script Kiddy authored Jun 18, 2020
  
  f36a42ec
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c21195b2
  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"
```
  c21195b2
- GIT_SILENT made messages (after extraction) · f9a4a290
  Script Kiddy authored Jun 17, 2020
  
  f9a4a290
11 Jun, 2020 1 commit

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

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

61f95c13

09 Jun, 2020 1 commit

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

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

72f3c666

10 May, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d841f373
  Script Kiddy authored May 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"
```
  d841f373
- GIT_SILENT made messages (after extraction) · 03b04223
  Script Kiddy authored May 10, 2020
  
  03b04223
05 May, 2020 1 commit
- GIT_SILENT made messages (after extraction) · f22a19bd
  Script Kiddy authored May 05, 2020
  
  f22a19bd
03 May, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 7318c5f0
  Script Kiddy authored May 03, 2020
  
  7318c5f0
09 Apr, 2020 1 commit

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

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

8f56d945

21 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 44ff4866
  Script Kiddy authored Mar 21, 2020
  
  44ff4866
04 Feb, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 523b8a38
  Script Kiddy authored Feb 04, 2020
  
  523b8a38
31 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 01dd0cbf
  Script Kiddy authored Jan 31, 2020
  
  01dd0cbf
28 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 22a08c46
  Script Kiddy authored Jan 28, 2020
  
  22a08c46
17 Jan, 2020 1 commit
- Port to QRandomGenerator · 8dfc65bc
  Laurent Montel authored Jan 17, 2020
  
  8dfc65bc
09 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 04a15514
  Script Kiddy authored Jan 09, 2020
  
  04a15514
30 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · c867cd04
  Script Kiddy authored Dec 30, 2019
  
  c867cd04
19 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 32e6b5bb
  Script Kiddy authored Dec 19, 2019
  
  32e6b5bb
15 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 338517d2
  Script Kiddy authored Dec 15, 2019
  
  338517d2
14 Dec, 2019 1 commit
- icon is just called kipi · ad10a82c
  Jonathan Riddell authored Dec 14, 2019
  
  ad10a82c
12 Dec, 2019 1 commit
- add a category · 68376d0a
  Jonathan Riddell authored Dec 12, 2019
  
  68376d0a
10 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 652746f3
  Script Kiddy authored Dec 10, 2019
  
  652746f3
09 Dec, 2019 1 commit
- also extends kphotoalbum · 08d1b20c
  Jonathan Riddell authored Dec 09, 2019
  
  08d1b20c
07 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 3cc190ea
  Script Kiddy authored Dec 07, 2019
  
  3cc190ea
06 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · b6c5cd07
  Script Kiddy authored Dec 06, 2019
  
  b6c5cd07
05 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · a513ebf2
  Script Kiddy authored Dec 05, 2019
  
  a513ebf2
03 Dec, 2019 2 commits
- typo · 335269ae
  Jonathan Riddell authored Dec 03, 2019
  
  335269ae
- add appstream file · c961ff49
  Jonathan Riddell authored Dec 03, 2019
```
BUG:391669
```
  c961ff49
27 Nov, 2019 3 commits
- Merge remote-tracking branch 'origin/release/19.12' · e056fadd
  David Faure authored Nov 27, 2019
  
  e056fadd
- Enable QT_NO_URL_CAST_FROM_STRING and fix compilation · 94fa78b1
  David Faure authored Nov 27, 2019
  
  94fa78b1
- Fix conflicts of shortcuts · 4db2d47a
  Yunhe Guo authored Nov 27, 2019
```
Summary: Rotate left and Rotate right button have same shortcuts. They should be different to avoid conflicts.

Reviewers: #frameworks, apol

Reviewed By: apol

Differential Revision: https://phabricator.kde.org/D25564
```
  4db2d47a
11 Nov, 2019 1 commit

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

Script Kiddy authored Nov 11, 2019

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"

3e7b4ed1

10 Nov, 2019 1 commit

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

Script Kiddy authored Nov 10, 2019

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"

bfe6801c

11 Oct, 2019 1 commit

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

Script Kiddy authored Oct 11, 2019

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"

35950491

17 Aug, 2019 1 commit

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

Script Kiddy authored Aug 17, 2019

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"

517f0181

10 Aug, 2019 1 commit

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

Script Kiddy authored Aug 10, 2019

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"

59b959d9