Commits · f32f0f0c392d419e858024ef22190fdeebb7a793 · Plasma / Plasma Desktop

11 Feb, 2020 1 commit

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

Script Kiddy authored Feb 11, 2020

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"

f32f0f0c

01 Feb, 2020 1 commit

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

Script Kiddy authored Feb 01, 2020

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"

acf38e4c

28 Jan, 2020 1 commit

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

Script Kiddy authored Jan 28, 2020

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"

b089d659

25 Jan, 2020 1 commit

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

Script Kiddy authored Jan 25, 2020

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"

bd0cd98d

22 Jan, 2020 1 commit

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

Script Kiddy authored Jan 22, 2020

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"

f256a0df

21 Jan, 2020 1 commit

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

Script Kiddy authored Jan 21, 2020

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"

5203edab

19 Jan, 2020 2 commits

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

Script Kiddy authored Jan 19, 2020

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"

a27db0f1

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

Script Kiddy authored Jan 19, 2020

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"

4a745b7c

18 Jan, 2020 2 commits

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

Script Kiddy authored Jan 18, 2020

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"

58bee891

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

Script Kiddy authored Jan 18, 2020

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"

9f7b53b5

17 Jan, 2020 1 commit

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

Script Kiddy authored Jan 17, 2020

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"

f43eebd3

16 Jan, 2020 2 commits

[KDED KCM] Rewrite as KDeclarative ScrollViewKCM · aa2119a8

Kai Uwe Broulik authored Jan 16, 2020

This rewrites the "Background services" KCM in QML using ScrollViewKCM.
The two separate list views are merged into a single one with the configurable services at the top,
and the ones that are loaded on-demand and "only for your convenience" at the bottom.
A search field is added searching through name and plugin ID. Since the sortable table headers are gone,
a filter combo is provided instead to filter for all, running, or non-running services.
As an extra Schmankerl when starting a service that immediately disables itself again (which technically isn't an error
that would be indicated as such) a hint is shown you're not left wondering why it doesn't start.
A hint is also displayed when services got automatically started/stopped when applying settings as this reloads kded5.
Furthermore, the code is cleaned up a lot (quite eerie, adding a 2020 Copyright to an existing 2002 one :),
ported to json plugin data, and a proper QAbstractListModel added.

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

aa2119a8

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

Script Kiddy authored Jan 16, 2020

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"

e21b9eae

23 Oct, 2019 1 commit

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

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

8a5439f8

17 Sep, 2019 1 commit

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

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

09e4a731

03 Sep, 2019 1 commit

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

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

1121b3b6

18 Feb, 2019 1 commit

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

Script Kiddy authored Feb 18, 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"

90767ad7

31 Jan, 2019 1 commit

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

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

a02e2e90

25 Jan, 2019 1 commit

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

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

8bc49277

20 Jan, 2019 1 commit

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

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

e5c063c8

19 Jan, 2019 1 commit

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

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

88fdc2b1

16 Jan, 2019 1 commit

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

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

a2a3ea78

22 Nov, 2018 1 commit

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

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

ed3f246d

12 Oct, 2017 1 commit

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

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

ab14cd61

11 Oct, 2017 1 commit

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

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

b25ffdbb

26 Feb, 2017 3 commits

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

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

58a97def

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

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

77ec9961

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

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

a17afebe

11 Feb, 2017 2 commits

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

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

ee01448e

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

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

c395881f

10 Feb, 2017 1 commit

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

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

7e08e22f

20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

e9fee9c2

31 May, 2016 1 commit

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

Script Kiddy authored May 31, 2016

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"

0f07e8bc

14 Feb, 2016 1 commit

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

Script Kiddy authored Feb 14, 2016

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"

77d7c656

17 Jan, 2016 1 commit

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

Script Kiddy authored Jan 17, 2016

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"

3963f47a

10 Jan, 2016 2 commits
- SVN_SILENT made messages (.desktop file) · 9f115b30
  Script Kiddy authored Jan 10, 2016
  
  9f115b30
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1a48da61
  Script Kiddy authored Jan 10, 2016
```
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"
```
  1a48da61
21 Nov, 2015 1 commit

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

Script Kiddy authored Nov 21, 2015

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"

fe432b59

16 Nov, 2015 1 commit

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

Script Kiddy authored Nov 16, 2015

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"

4dcaae4e

04 Nov, 2015 1 commit

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

Script Kiddy authored Nov 04, 2015

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"

0048637f