Commits · 8220565670f676b63618768ead78b7f6462ca1a2 · Plasma / SDDM KCM

23 Oct, 2018 1 commit

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

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

82205656

22 Oct, 2018 1 commit

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

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

e93cee60

21 Oct, 2018 1 commit

sddm-kcm: don't hardcode session file location. · 1c1f654b

Róbert Bagdán authored Oct 20, 2018

Summary:
The sddm-kcm uses /usr/share/xsessions and /usr/share/wayland-sessions pathes, but in FreeBSD the correct path is /usr/local/share/*.

This cause, that in sddm page of systemsettings, in the part of automatic login, the sessions are empty.

See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=232356

Reviewers: #freebsd, #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

1c1f654b

20 Oct, 2018 1 commit

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

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

7ee6fa1e

17 Oct, 2018 1 commit

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

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

ec97e1e4

16 Oct, 2018 1 commit

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

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

fba3c498

15 Oct, 2018 1 commit

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

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

2ef89887

14 Oct, 2018 1 commit

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

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

e8033ebc

12 Oct, 2018 1 commit

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

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

c3e7ca4f

11 Oct, 2018 1 commit

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

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

b0742976

10 Oct, 2018 1 commit

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

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

06ab0e67

09 Oct, 2018 1 commit
- Give SDDM knsrc file a name · b3928bb5
  Aleix Pol Gonzalez authored Oct 09, 2018
```
Hides the fact that it's SDDM as an implementation detail.

BUG: 399526
```
  b3928bb5
04 Oct, 2018 2 commits
- Update version number for 5.14.80 · 3f440663
  Jonathan Riddell authored Oct 04, 2018
```
GIT_SILENT
```
  3f440663
- Update version number for 5.14.0 · 36b6c658
  Jonathan Riddell authored Oct 04, 2018
```
GIT_SILENT
```
  36b6c658
19 Sep, 2018 1 commit
- Make it compile with KDEFrameworkCompilerSettings module · 7d5558aa
  Laurent Montel authored Sep 19, 2018
  
  7d5558aa
14 Sep, 2018 3 commits

Merge branch 'Plasma/5.14' · 1ea6533d
Fabian Vogt authored Sep 14, 2018

1ea6533d
Merge branch 'Plasma/5.12' into Plasma/5.14 · f746728b
Fabian Vogt authored Sep 14, 2018

f746728b

Workaround QTBUG-47066 to fix crash on startup · 0497a6e9

Fabian Vogt authored Sep 14, 2018

Summary:
The lambda returns a QStringBuilder which contains dangling references.
Work around that by converting to QString inside the lambda's context.

Test Plan: Does not crash anymore.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

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

0497a6e9

13 Sep, 2018 3 commits
- Update version number for 5.14.80 · 6f82c600
  Jonathan Riddell authored Sep 13, 2018
```
GIT_SILENT
```
  6f82c600
- Update version number for 5.13.90 · 8294b1e1
  Jonathan Riddell authored Sep 13, 2018
```
GIT_SILENT
```
  8294b1e1
- GIT_SILENT · edbbb1b6
  Jonathan Riddell authored Sep 13, 2018
  
  edbbb1b6
08 Sep, 2018 2 commits

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

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

994fd06c

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

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

101639c8

03 Sep, 2018 1 commit
- QT_MIN_VERSIONS is Qt 5.11 for Plasma 5.14. Agreed at kickoff meeting. Set... · f2b5f266
  Jonathan Riddell authored Sep 03, 2018
```
QT_MIN_VERSIONS is Qt 5.11 for Plasma 5.14. Agreed at kickoff meeting.  Set everywhere for clearity and consistency.
```
  f2b5f266
28 Aug, 2018 1 commit

Sync MAX_UID with upstream · 14213590

Antonio Rojas authored Aug 28, 2018

Dynamic users are getting more widely used in latest versions of systemd, and some users are reporting them showing up in SDDM. These users get an UID in the 61184–65519 range.
Lower MAX_UID to 60000 to make sure they are not displayed in SDDM by default. This also brings this value in sync with the default upstream MaximumUID

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

14213590

11 Jul, 2018 3 commits
- Remove deprecated class · 097d6c64
  Laurent Montel authored Jul 11, 2018
  
  097d6c64
- Check version · 6faea6aa
  Laurent Montel authored Jul 11, 2018
  
  6faea6aa
- Remove unused include moc · 5d641f20
  Laurent Montel authored Jul 11, 2018
  
  5d641f20
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
27 Jun, 2018 1 commit
- Update version number for 5.12.6 · 08e06eb1
  Jonathan Riddell authored Jun 27, 2018
```
GIT_SILENT
```
  08e06eb1
18 Jun, 2018 2 commits

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

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"

569fcc2a

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 6 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 · e8b18aa5
  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"
```
  e8b18aa5
- 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 1 commit
- Use installedTheme · e5f77f2a
  Laurent Montel authored May 15, 2018
  
  e5f77f2a