Commits · master · Plasma / Plymouth KCM

17 Jan, 2022 1 commit

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

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

c323acc9

16 Jan, 2022 1 commit

Add missing explicit exec line to KCM desktop file · 41778172

Alexander Lohnau authored Jan 16, 2022

With `Type=Application`, we need to specify this explicitly.
Before KService would internally set the exec value.

41778172

14 Jan, 2022 1 commit

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

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

bde499a0

13 Jan, 2022 2 commits
- Update version number for 5.24.80 · c27cfb20
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  c27cfb20
- Update version number for 5.23.90 · 68158a90
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  68158a90
05 Jan, 2022 1 commit

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

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

4b367c26

03 Jan, 2022 2 commits

refactor update-alternatives install into a helper function · 9ce5c7e5
Harald Sitter authored Dec 15, 2021
```
cuts down on code duplication
```
9ce5c7e5

fix update-alternatives checking · 930f705b

Harald Sitter authored Dec 15, 2021

this now lives in bin. indeed we don't care where it lives so long as
it is in path. consequently let's check via QSP

also stop repeating the literal all over the place, use a helper function
for the executable name

930f705b

02 Jan, 2022 1 commit

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

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

f5516116

30 Dec, 2021 1 commit

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

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

1e9ab17b

26 Dec, 2021 1 commit

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

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

87f8af87

15 Dec, 2021 2 commits

Use Q_EMIT here · 06e060ed
Laurent Montel authored Dec 15, 2021

06e060ed

modernzie code a tad · 41207acd

Harald Sitter authored Dec 15, 2021

- don't }else{} after returns
- don't stream into qstringlists, use init lists
- scope variables to blocks where possible
- use any_of and chrono literals to make code more legible
- more constness

41207acd

14 Dec, 2021 1 commit

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

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

60039d7e

13 Dec, 2021 1 commit

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

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

0f849389

12 Dec, 2021 2 commits
- Fix clazy warnings · e79e0adb
  Laurent Montel authored Dec 12, 2021
  
  e79e0adb
- GIT_SILENT: it compiles fine without deprecated method · 8b4aecb0
  Laurent Montel authored Dec 12, 2021
  
  8b4aecb0
10 Dec, 2021 1 commit

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

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

4f0c914f

08 Dec, 2021 3 commits
- Add Linux CI · dc1874be
  Nicolas Fella authored Oct 05, 2021
  
  dc1874be
- Add .kde-ci.yml · 15d6ca67
  Nicolas Fella authored Oct 05, 2021
  
  15d6ca67
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6370dee6
  Script Kiddy authored Dec 08, 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"
```
  6370dee6
07 Dec, 2021 1 commit

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

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

774574f1

06 Dec, 2021 1 commit

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

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

ca8719ac

05 Dec, 2021 1 commit

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

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

38fa7f65

04 Dec, 2021 1 commit

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

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

3b14f1c5

03 Dec, 2021 2 commits

Install KCMs in new namespaces, convert desktop file to json · 63524350

Alexander Lohnau authored Dec 03, 2021

This is where systemsettings will look for plugins when not going through KServiceTypeTarder

For the integration with the taskmanager the desktop file is installed as an application
with NoDisplay=true.

Task: https://phabricator.kde.org/T14517

63524350

De-duplicate json metadata of KPackages · b67c4ec9
Alexander Lohnau authored Dec 03, 2021
```
Task: https://phabricator.kde.org/T14983
```
b67c4ec9

13 Nov, 2021 1 commit

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

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

e4105a21

11 Nov, 2021 1 commit

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

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

dd92ad1f

09 Nov, 2021 1 commit
- GIT_SILENT: Allow to show header in qtc6 · 78a54e22
  Laurent Montel authored Nov 09, 2021
  
  78a54e22
11 Oct, 2021 1 commit
- Update kf5 version requirement to 5.86 · 9fb5ee22
  Jonathan Riddell authored Oct 11, 2021
```
GIT_SILENT
```
  9fb5ee22
06 Oct, 2021 1 commit

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

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

23b41642

26 Sep, 2021 1 commit

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

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

b91a1605

24 Sep, 2021 1 commit

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

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

b4f2a596

21 Sep, 2021 1 commit

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

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

d0081288

19 Sep, 2021 1 commit

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

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

6a20cb38

18 Sep, 2021 1 commit

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

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

bf7437c0

16 Sep, 2021 2 commits
- Update version number for 5.23.80 · 35ef7d0a
  Jonathan Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  35ef7d0a
- Update version number for 5.22.90 · 895335e3
  Jonathan Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  895335e3
15 Sep, 2021 1 commit

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

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

1d5d384f