Commits · master · Plasma / SDDM KCM

17 Jan, 2022 1 commit

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

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"

2c8bbb0c

16 Jan, 2022 1 commit
- Allow to build against qt6 · 5cb51e82
  Laurent Montel authored Jan 16, 2022
  
  5cb51e82
14 Jan, 2022 1 commit

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

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"

8c6b2c10

13 Jan, 2022 2 commits
- Update version number for 5.24.80 · 86a26c0e
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  86a26c0e
- Update version number for 5.23.90 · 30fb4591
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  30fb4591
08 Jan, 2022 1 commit

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

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

d95c6475

05 Jan, 2022 1 commit

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

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"

ad63db3c

04 Jan, 2022 1 commit

Warn the user about KWallet complications when using auto-login · 2438cf4b

Nate Graham authored Dec 27, 2021

When auto-login is being used, The user's KWallet does not unlock
automatically if it has a password set, which can be annoying, and is a
technical detail that is not explained to the user.

This commit adds a warning message that tells all of this to the user,
gives them a suggested course of action (set the password to an empty
string), warns them of the consequences of this, and gives them a button
they can click that will take them to the place where they can do it.

The message is not shown when kwallet support is not installed.

2438cf4b

02 Jan, 2022 1 commit

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

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"

1982e005

29 Dec, 2021 1 commit

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

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

53635555

26 Dec, 2021 1 commit

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

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"

83da66f8

14 Dec, 2021 1 commit

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

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"

129e84a8

13 Dec, 2021 1 commit

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

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"

db9d99bd

10 Dec, 2021 1 commit

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

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"

fd8b2e93

09 Dec, 2021 1 commit
- GIT_SILENT Clean up unneeded entry from .gitignore · e82fec1c
  Alexander Lohnau authored Dec 09, 2021
  
  e82fec1c
08 Dec, 2021 1 commit

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

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"

66290eef

07 Dec, 2021 1 commit

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

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"

c86d164d

06 Dec, 2021 1 commit

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

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"

797be56c

05 Dec, 2021 1 commit

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

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"

8730a44d

04 Dec, 2021 1 commit

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

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"

6a22b441

03 Dec, 2021 2 commits

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

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

82d2c35a

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

17 Nov, 2021 1 commit

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

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

4b4875c6

13 Nov, 2021 1 commit

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

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"

2298fcce

01 Nov, 2021 1 commit
- Fix errors about undefined theme and units · 841aff7a
  Nate Graham authored Nov 01, 2021
```
These need to be fully-qualified now.
```
  841aff7a
27 Oct, 2021 1 commit
- Remove -Iconfigwidgets, does not exist [-Wmissing-include-dirs] · 6e31ae0f
  David Faure authored Oct 27, 2021
```
GIT_SILENT
```
  6e31ae0f
20 Oct, 2021 1 commit
- Add missing Q_OBJECT macro · a71f6a49
  Alexander Lohnau authored Oct 20, 2021
```
Task: https://phabricator.kde.org/T14952
```
  a71f6a49
15 Oct, 2021 1 commit

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

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

698b9a5f

11 Oct, 2021 1 commit
- Update kf5 version requirement to 5.86 · b27eff63
  Jonathan Riddell authored Oct 11, 2021
```
GIT_SILENT
```
  b27eff63
06 Oct, 2021 2 commits
- Add FreeBSD CI · c8f983d7
  Nicolas Fella authored Oct 07, 2021
  
  c8f983d7
- SVN_SILENT made messages (.desktop file) - always resolve ours · df722421
  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"
```
  df722421
01 Oct, 2021 1 commit
- Add CI linux · c285d4cb
  Laurent Montel authored Oct 01, 2021
  
  c285d4cb
27 Sep, 2021 1 commit

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

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

7066534b

26 Sep, 2021 1 commit

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

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"

d696929f

25 Sep, 2021 1 commit

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

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

defdc852

19 Sep, 2021 1 commit

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

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"

8c7624ae

18 Sep, 2021 1 commit

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

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"

e8222aea

17 Sep, 2021 1 commit

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

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

c59eb4be

16 Sep, 2021 2 commits
- Update version number for 5.23.80 · 5e09c6bc
  Jonathan Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  5e09c6bc
- Update version number for 5.22.90 · 2c0d586c
  Jonathan Riddell authored Sep 16, 2021
```
GIT_SILENT
```
  2c0d586c