Commits · 2970915c48af3ba9057c2c8b7a46ec37279358f4 · Plasma / KScreen

09 Mar, 2019 1 commit
- Fix warning (== vs ===) · 2970915c
  Laurent Montel authored Mar 09, 2019
  
  2970915c
01 Mar, 2019 1 commit
- Remove deprecated method · 82772aba
  Laurent Montel authored Mar 01, 2019
  
  82772aba
07 Feb, 2019 1 commit

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

Script Kiddy authored Feb 07, 2019

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"

14cc6fb3

01 Feb, 2019 4 commits

Don't reset the moved display position · 2c5af49d

Andras Mantia authored Jan 08, 2019

Summary:
This fixes the problem that after moving a display, clicking on another one
and clicking on the original one, its position got reset to the default one.
This due to layouting in the widget when displays are clicked, the
ControlPanel hides/shows the corresponding OutputConfig, which results in a
temporary layout changed, that causes a geometry change for the QML view,
that causes am updateOutpusPlacement()...

Reviewers: dvratil

Reviewed By: dvratil

Subscribers: plasma-devel

Tags: #plasma

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

2c5af49d

Merge remote-tracking branch 'origin/Plasma/5.14' · 3c0f7e0b
Andras Mantia authored Feb 01, 2019

3c0f7e0b
Merge remote-tracking branch 'origin/Plasma/5.12' into Plasma/5.14 · 6ad0efd1
Andras Mantia authored Feb 01, 2019

6ad0efd1

Calculate screen scaling dynamically, so it always fits to the page · ca4d74ac

Andras Mantia authored Dec 19, 2018

Reviewers: #plasma, dvratil

Reviewed By: dvratil

Subscribers: ngraham, plasma-devel

Tags: #plasma

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

ca4d74ac

26 Jan, 2019 1 commit

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

Script Kiddy authored Jan 26, 2019

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"

32264fe6

17 Jan, 2019 3 commits
- Update version number for 5.15.80 · 2700bd35
  Jonathan Riddell authored Jan 17, 2019
```
GIT_SILENT
```
  2700bd35
- Update version number for 5.14.90 · fa3af501
  Jonathan Riddell authored Jan 17, 2019
```
GIT_SILENT
```
  fa3af501
- bump KF5 dependency to required 5.54 as agreed at start of Plasma 5.15 cycle · 4e75253a
  Jonathan Riddell authored Jan 17, 2019
  
  4e75253a
10 Jan, 2019 1 commit

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

Script Kiddy authored Jan 10, 2019

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"

20f0bd3c

09 Jan, 2019 3 commits
- Merge branch 'Plasma/5.14' · 1e9b93d4
  Andras Mantia authored Jan 09, 2019
  
  1e9b93d4
- Merge branch 'Plasma/5.12' into Plasma/5.14 · 20178a39
  Andras Mantia authored Jan 09, 2019
  
  20178a39
- Don't lose the widget layout after Default is pressed · 3e90b446
  Andras Mantia authored Jan 09, 2019
```
Summary: BUG: 400302

Reviewers: dvratil, #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D18121
```
  3e90b446
08 Jan, 2019 2 commits
- SVN_SILENT Small formatting fix · 44309f10
  Andras Mantia authored Jan 08, 2019
  
  44309f10
- Update version number for 5.14.5 · f698b831
  Jonathan Riddell authored Jan 08, 2019
```
GIT_SILENT
```
  f698b831
07 Jan, 2019 2 commits

Use the nicer K_PLUGIN_CLASS_WITH_JSON · 1834f796

Albert Astals Cid authored Jan 07, 2019

Reviewers: davidedmundson

Reviewed By: davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

1834f796

Show unconnected displays at the right side of the main screen · 25083d97

Andras Mantia authored Dec 19, 2018

Summary:
Until now they were shown half behind the center (main) screen.
This makes it nicer, although with many screens it might flow too much to the right.
For this reason, reduce the visual size of the screens.
More work in this sense will follow.

Reviewers: dvratil

Reviewed By: dvratil

Subscribers: plasma-devel

Tags: #plasma

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

25083d97

06 Jan, 2019 2 commits

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

Script Kiddy authored Jan 06, 2019

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"

56158770

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

Script Kiddy authored Jan 06, 2019

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"

1c1c9ba5

05 Jan, 2019 2 commits

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

Script Kiddy authored Jan 05, 2019

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"

46090970

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

Script Kiddy authored Jan 05, 2019

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"

76594778

30 Dec, 2018 1 commit

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

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

4f93be17

29 Dec, 2018 1 commit

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

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

8801606c

28 Dec, 2018 2 commits

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

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

3e4ce957

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

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

c3315e82

26 Dec, 2018 2 commits

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

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

53285392

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

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

cc1abcba

24 Dec, 2018 1 commit

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

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

6252d5e6

23 Dec, 2018 2 commits

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

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

4e87be9c

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

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

bbcef241

22 Dec, 2018 2 commits

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

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

61d05fec

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

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

eb4ae75f

21 Dec, 2018 2 commits

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

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

2392326d

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

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

c4f18c7c

20 Dec, 2018 2 commits

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

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

7d383104

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

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

b1a8a4d2

19 Dec, 2018 2 commits
- Merge remote-tracking branch 'origin/Plasma/5.14' · e8016dda
  Andras Mantia authored Dec 19, 2018
  
  e8016dda
- Merge branch 'Plasma/5.12' into Plasma/5.14 · a3fee70e
  Andras Mantia authored Dec 19, 2018
  
  a3fee70e