Commits · 7a9b287424b6c06e175e64bcb1bdecbeba6afaba · Plasma / SDDM KCM

04 Jul, 2018 2 commits
- Use nullptr. Use const'ref · 7a9b2874
  Laurent Montel authored Jul 04, 2018
  
  7a9b2874
- Make compile with strict compile flags (I found a missing i18n too) · 67ab368c
  Laurent Montel authored Jul 04, 2018
  
  67ab368c
18 Jun, 2018 1 commit

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

Script Kiddy authored Jun 18, 2018

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"

064a30f4

18 May, 2018 5 commits
- Update version number for 5.13.80 · 4a1eb8d0
  Jonathan Riddell authored May 18, 2018
```
GIT_SILENT
```
  4a1eb8d0
- Update version number for 5.13.90 · de638fb4
  Jonathan Riddell authored May 18, 2018
```
GIT_SILENT
```
  de638fb4
- Update version number for 5.14.80 · 9aa6550c
  Jonathan Riddell authored May 18, 2018
```
GIT_SILENT
```
  9aa6550c
- Update version number for 5.12.90 · ed1c6267
  Jonathan Riddell authored May 18, 2018
```
GIT_SILENT
```
  ed1c6267
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9e64a52e
  Script Kiddy authored May 18, 2018
```
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"
```
  9e64a52e
15 May, 2018 2 commits
- Use installedTheme · e5f77f2a
  Laurent Montel authored May 15, 2018
  
  e5f77f2a
- Warning-- · 07aedf7e
  Laurent Montel authored May 15, 2018
  
  07aedf7e
20 Apr, 2018 3 commits

Merge branch 'Plasma/5.12' · a2083bb2
Fabian Vogt authored Apr 20, 2018

a2083bb2

Also read sddm.conf.d config directories · c879e4fa

Fabian Vogt authored Apr 19, 2018

Summary:
SDDM reads files in alphabetical order from /usr/lib/sddm/sddm.conf.d/,
then /etc/sddm.conf.d/ and /etc/sddm.conf. The latest occurence takes
precedence.
The paths in CMakeLists are copied from sddm.

Test Plan: kcmshell5 kcm_sddm now shows the right preselected values.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12359

c879e4fa

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

Script Kiddy authored Apr 20, 2018

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"

a6163b57

19 Apr, 2018 3 commits

Use XCursorTheme on wayland as well · 4af19263

Fabian Vogt authored Apr 19, 2018

Summary: wayland-cursor uses xcursor to load cursors, so this is fine.

Test Plan: I can select cursors on wayland again.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12361

4af19263

Merge branch 'Plasma/5.12' · b8d0537b
Fabian Vogt authored Apr 19, 2018

b8d0537b

Read theme.conf of themes · ebdfab7e

Fabian Vogt authored Apr 18, 2018

Summary:
Otherwise kcm_sddm ignores values in there. Previously, a theme with a default
background image reverts to a color background on save.

Test Plan: Ran kcm_sddm and saved without changes. The background type is still image.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D12323

ebdfab7e

03 Apr, 2018 2 commits

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

Script Kiddy authored Apr 03, 2018

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"

b654b0f0

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

Script Kiddy authored Apr 03, 2018

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"

825443ef

27 Mar, 2018 1 commit
- Update version number for 5.12.4 · 196b1115
  Jonathan Riddell authored Mar 27, 2018
```
GIT_SILENT
```
  196b1115
26 Mar, 2018 1 commit

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

Script Kiddy authored Mar 26, 2018

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"

0507c8b6

11 Mar, 2018 1 commit

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

Script Kiddy authored Mar 11, 2018

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"

4e58560c

06 Mar, 2018 1 commit
- Update version number for 5.12.3 · 41255c02
  Jonathan Riddell authored Mar 06, 2018
```
GIT_SILENT
```
  41255c02
03 Mar, 2018 1 commit

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

Script Kiddy authored Mar 03, 2018

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"

48cc86d2

20 Feb, 2018 1 commit
- Update version number for 5.12.2 · fea4a827
  Jonathan Riddell authored Feb 20, 2018
```
GIT_SILENT
```
  fea4a827
13 Feb, 2018 1 commit
- Update version number for 5.12.1 · 7e2e9a53
  Jonathan Riddell authored Feb 13, 2018
```
GIT_SILENT
```
  7e2e9a53
01 Feb, 2018 1 commit
- Update version number for 5.12.0 · eaf300d8
  Bhushan Shah authored Feb 01, 2018
```
GIT_SILENT
```
  eaf300d8
28 Jan, 2018 2 commits

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

Script Kiddy authored Jan 28, 2018

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"

9da4834e

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

Script Kiddy authored Jan 28, 2018

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"

2bce4cb5

23 Jan, 2018 1 commit

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

Script Kiddy authored Jan 23, 2018

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"

3adbfabb

19 Jan, 2018 2 commits

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

Script Kiddy authored Jan 19, 2018

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"

ab90ab1a

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

Script Kiddy authored Jan 19, 2018

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"

37a36fc0

15 Jan, 2018 2 commits
- Update version number for 5.12.80 · 4dbee6d5
  Jonathan Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  4dbee6d5
- Update version number for 5.11.95 · 688d9427
  Jonathan Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  688d9427
12 Jan, 2018 1 commit

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

Script Kiddy authored Jan 12, 2018

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"

12b24557

05 Jan, 2018 1 commit
- Remove obsolete reviewboardrc file · 2e45b550
  Laurent Montel authored Jan 05, 2018
  
  2e45b550
17 Dec, 2017 1 commit

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

Script Kiddy authored Dec 17, 2017

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"

6eb43586

13 Dec, 2017 1 commit

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

Script Kiddy authored Dec 13, 2017

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"

679e2e32

06 Dec, 2017 1 commit

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

Script Kiddy authored Dec 06, 2017

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"

91f2b457

03 Dec, 2017 1 commit

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

Script Kiddy authored Dec 03, 2017

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"

ee6b15fa

29 Nov, 2017 1 commit

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

Script Kiddy authored Nov 29, 2017

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"

cc13dea5