Commits · master · Utilities / Print Manager

25 Jun, 2022 1 commit

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

Script Kiddy authored Jun 25, 2022

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"

68244a1e

20 Jun, 2022 1 commit

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

Script Kiddy authored Jun 20, 2022

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"

87d2642e

16 Jun, 2022 1 commit

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

Script Kiddy authored Jun 16, 2022

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"

0e2d46db

13 Jun, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0249a505
  Script Kiddy authored Jun 13, 2022
```
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"
```
  0249a505
- GIT_SILENT made messages (after extraction) · 11a42903
  Script Kiddy authored Jun 13, 2022
  
  11a42903
04 Jun, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 2c584b83
  Heiko Becker authored Jun 04, 2022
```
(cherry picked from commit e5707500)
```
  2c584b83
28 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0287b756
  Script Kiddy authored May 28, 2022
```
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"
```
  0287b756
- GIT_SILENT made messages (after extraction) · 70b049bf
  Script Kiddy authored May 28, 2022
  
  70b049bf
22 May, 2022 1 commit
- Add ki18n_install · 8a71d7c9
  Albert Astals Cid authored May 22, 2022
  
  8a71d7c9
15 May, 2022 5 commits
- We need Qt6::Core5Compat · b36a2641
  Laurent Montel authored May 15, 2022
  
  b36a2641
- Port to QRegularExpressionValidator · c1b25bb2
  Laurent Montel authored May 15, 2022
  
  c1b25bb2
- Fix some compile error against qt6 · 4474837c
  Laurent Montel authored May 15, 2022
  
  4474837c
- Adapt build system to qt6 · 3eb9284a
  Laurent Montel authored May 15, 2022
  
  3eb9284a
- fix logic (need need to compare count() to 4) · dad08229
  Laurent Montel authored May 15, 2022
  
  dad08229
07 May, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 631b0864
  Heiko Becker authored May 07, 2022
```
(cherry picked from commit 16402b4c)
```
  631b0864
30 Apr, 2022 2 commits
- Remove unneeded include dirs · 5966b212
  Nicolas Fella authored May 01, 2022
  
  5966b212
- Use FindCups from CMake · e8981d8d
  Nicolas Fella authored Apr 30, 2022
  
  e8981d8d
29 Apr, 2022 1 commit
- Fix copy/paste error in FindCupsSmb · 421f0bd2
  Nicolas Fella authored Apr 30, 2022
  
  421f0bd2
16 Apr, 2022 1 commit

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

Script Kiddy authored Apr 16, 2022

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"

89b0d712

12 Apr, 2022 1 commit
- GIT_SILENT Update Appstream for new release · d20c4f2f
  Heiko Becker authored Apr 12, 2022
```
(cherry picked from commit d6cae761)
```
  d20c4f2f
08 Apr, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c9409b96
  Script Kiddy authored Apr 08, 2022
```
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"
```
  c9409b96
- GIT_SILENT made messages (after extraction) · c359054e
  Script Kiddy authored Apr 08, 2022
  
  c359054e
30 Mar, 2022 3 commits
- applet: put PlaceholderMessage in a Loader to save a bit of memory · 3cebb72a
  Nate Graham authored Mar 30, 2022
  
  3cebb72a
- applet: show a more appropriate message when a search yields no results · 1d4452ce
  Nate Graham authored Mar 30, 2022
  
  1d4452ce
- applet: use normal placeholder text for a search field · 24e70b7a
  Nate Graham authored Mar 30, 2022
```
Later we can port this to use PlasmaExtras.SearchField, but we can't do
it yet because it's too new.
```
  24e70b7a
29 Mar, 2022 1 commit

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

Script Kiddy authored Mar 29, 2022

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"

0d8ad5b7

23 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 12ba07c7
  Script Kiddy authored Mar 23, 2022
  
  12ba07c7
21 Mar, 2022 2 commits
- Revert "Revert "Port to PlasmaExtras version of Highlight"" · da42f3d3
  Kai Uwe Broulik authored Mar 21, 2022
```
Re-instate it on master branch.

This reverts commit 1abb32b7.
```
  da42f3d3
- Merge branch 'release/22.04' · eec29430
  Kai Uwe Broulik authored Mar 21, 2022
  
  eec29430
20 Mar, 2022 5 commits
- Revert "Port to PlasmaExtras version of Highlight" · 1abb32b7
  Kai Uwe Broulik authored Mar 20, 2022
```
It requires Plasma Framework 5.93 which is higher than the
dependency allowed by 22.04 release.

This reverts commit 68331057.

BUG: 451713
```
  1abb32b7
- SVN_SILENT made messages (.desktop file) - always resolve ours · 725f704f
  Script Kiddy authored Mar 20, 2022
```
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"
```
  725f704f
- GIT_SILENT made messages (after extraction) · 0e25bbbb
  Script Kiddy authored Mar 20, 2022
  
  0e25bbbb
- SVN_SILENT made messages (.desktop file) - always resolve ours · c8f4216b
  Script Kiddy authored Mar 20, 2022
```
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"
```
  c8f4216b
- GIT_SILENT made messages (after extraction) · 40aaacc6
  Script Kiddy authored Mar 20, 2022
  
  40aaacc6
12 Mar, 2022 2 commits
- GIT_SILENT Upgrade release service version to 22.07.70. · db216c04
  Albert Astals Cid authored Mar 12, 2022
  
  db216c04
- GIT_SILENT Upgrade release service version to 22.03.80. · 5c365fac
  Albert Astals Cid authored Mar 12, 2022
  
  5c365fac
11 Mar, 2022 1 commit

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

Script Kiddy authored Mar 11, 2022

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"

af1da477

08 Mar, 2022 1 commit
- Don't require a not yet existing ECM version · d1313e99
  Volker Krause authored Mar 08, 2022
```
Breaks the build everywhere.
```
  d1313e99
07 Mar, 2022 1 commit

Port to PlasmaExtras version of Highlight · 68331057

Nate Graham authored Mar 07, 2022

This lets us get rid of a PC2 import. It requires Frameworks 5.93, which
is where the PlasmaExtras version was added.

68331057

27 Feb, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 60ee4345
  Heiko Becker authored Feb 27, 2022
```
(cherry picked from commit 5717a4b5)
```
  60ee4345