Commits · master · Utilities / Okteta

06 Jan, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a118b90b
  Script Kiddy authored Jan 06, 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"
```
  a118b90b
- GIT_SILENT made messages (after extraction) · 9a8537ee
  Script Kiddy authored Jan 06, 2021
  
  9a8537ee
05 Jan, 2021 1 commit

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

Script Kiddy authored Jan 05, 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"

7ccd480e

04 Jan, 2021 1 commit

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

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"

aaa70b08

02 Jan, 2021 1 commit
- GIT_SILENT made messages (after extraction) · b1d0c266
  Script Kiddy authored Jan 02, 2021
  
  b1d0c266
26 Dec, 2020 2 commits
- Merge branch '0.26' · 4172a54a
  Friedrich W. H. Kossebau authored Dec 26, 2020
  
  4172a54a
- Port away from deprecated KSelectAction::triggered(int) · 5d8b84c4
  Friedrich W. H. Kossebau authored Dec 26, 2020
```
GIT_SILENT
```
  5d8b84c4
17 Dec, 2020 1 commit
- Port away from Qt6-incompatible operator+ with Qt key enums · 430b5298
  Friedrich W. H. Kossebau authored Dec 17, 2020
```
GIT_SILENT
```
  430b5298
09 Dec, 2020 1 commit
- Merge branch '0.26' · 325be48a
  Friedrich W. H. Kossebau authored Dec 09, 2020
  
  325be48a
08 Dec, 2020 5 commits
- Add explicit kdoctools_install(po) call · 4b06e29b
  Friedrich W. H. Kossebau authored Dec 09, 2020
```
GIT_SILENT
```
  4b06e29b
- Port away from deprecated QPrinter::paperRect/pageRect · b1cc1bf7
  Friedrich W. H. Kossebau authored Dec 08, 2020
```
GIT_SILENT
```
  b1cc1bf7
- Bump version to 0.26.5 · f2bb8837
  Friedrich W. H. Kossebau authored Dec 08, 2020
  
  f2bb8837
- Port to new KPluginMetaData-based KParts API · 299ba604
  Friedrich W. H. Kossebau authored Dec 08, 2020
```
GIT_SILENT
```
  299ba604
- Port away from deprecated KActionMenu::setDelayed/setStickyMenu · e843ccdf
  Friedrich W. H. Kossebau authored Dec 08, 2020
```
GIT_SILENT
```
  e843ccdf
07 Dec, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 905856e6
  Script Kiddy authored Dec 07, 2020
  
  905856e6
28 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 323140d9
  Script Kiddy authored Nov 28, 2020
  
  323140d9
20 Nov, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 4e944e81
  Script Kiddy authored Nov 20, 2020
  
  4e944e81
- GIT_SILENT made messages (after extraction) · 446b8e04
  Script Kiddy authored Nov 20, 2020
  
  446b8e04
19 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 4fdba65e
  Script Kiddy authored Nov 19, 2020
  
  4fdba65e
17 Nov, 2020 2 commits
- GIT_SILENT made messages (after extraction) · c3d9ee3a
  Script Kiddy authored Nov 17, 2020
  
  c3d9ee3a
- GIT_SILENT made messages (after extraction) · f9b34dc7
  Script Kiddy authored Nov 17, 2020
  
  f9b34dc7
15 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · deb0c64a
  Script Kiddy authored Nov 15, 2020
  
  deb0c64a
13 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 18f48d77
  Script Kiddy authored Nov 13, 2020
  
  18f48d77
12 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 2b1903c8
  Script Kiddy authored Nov 12, 2020
  
  2b1903c8
11 Nov, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 7220d482
  Script Kiddy authored Nov 11, 2020
  
  7220d482
- GIT_SILENT made messages (after extraction) · bfea89aa
  Script Kiddy authored Nov 11, 2020
  
  bfea89aa
09 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · ba8cc6c3
  Script Kiddy authored Nov 09, 2020
  
  ba8cc6c3
07 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · d0540ce5
  Script Kiddy authored Nov 07, 2020
  
  d0540ce5
05 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · b12337be
  Script Kiddy authored Nov 05, 2020
  
  b12337be
01 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · f263cbe8
  Script Kiddy authored Nov 01, 2020
  
  f263cbe8
30 Oct, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 94655bef
  Script Kiddy authored Oct 30, 2020
  
  94655bef
29 Oct, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 2363e63a
  Script Kiddy authored Oct 29, 2020
  
  2363e63a
28 Oct, 2020 1 commit
- GIT_SILENT made messages (after extraction) · c048722a
  Script Kiddy authored Oct 28, 2020
  
  c048722a
27 Oct, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 9126b1a1
  Script Kiddy authored Oct 27, 2020
  
  9126b1a1
14 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 824aac0b
  Script Kiddy authored Sep 14, 2020
  
  824aac0b
06 Sep, 2020 3 commits
- Merge branch '0.26' into master · 1c3ac02b
  Friedrich W. H. Kossebau authored Sep 06, 2020
  
  1c3ac02b
- Use SPDX variant of GNU Free Documentation License · 60c59698
  Friedrich W. H. Kossebau authored Sep 06, 2020
```
GIT_SILENT
```
  60c59698
- Add explicit ki18n_install(po) call · dc3dc96e
  Friedrich W. H. Kossebau authored Sep 06, 2020
```
GIT_SILENT
```
  dc3dc96e
31 Aug, 2020 2 commits
- Merge branch '0.26' into master · 5a30a2bb
  Friedrich W. H. Kossebau authored Aug 31, 2020
  
  5a30a2bb
- Port away from deprecated Qt::MidButton · 011e91a8
  Friedrich W. H. Kossebau authored Aug 31, 2020
```
GIT_SILENT
```
  011e91a8