Commits · master · Plasma / KInfoCenter

15 Jan, 2022 1 commit

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

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

96328084

14 Jan, 2022 1 commit

Drop unnecessary KIconThemes dependency · 8bd47ffb

Heiko Becker authored Jan 14, 2022

While at it also drop the duplicate "Declarative" from the
find_package(KF5 ...) invocation.

8bd47ffb

13 Jan, 2022 2 commits
- Update version number for 5.24.80 · c65650e4
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  c65650e4
- Update version number for 5.23.90 · ab2a547d
  Jonathan Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  ab2a547d
05 Jan, 2022 1 commit

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

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"

f86062f7

04 Jan, 2022 1 commit
- Update version number for 5.23.5 · b03c6e05
  Jonathan Riddell authored Jan 04, 2022
```
GIT_SILENT
```
  b03c6e05
02 Jan, 2022 1 commit

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

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"

001cd404

19 Dec, 2021 1 commit

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

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

004fe9de

16 Dec, 2021 1 commit

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

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

9ad8973f

15 Dec, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 542aab93
  Script Kiddy authored Dec 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"
```
  542aab93
- GIT_SILENT made messages (after extraction) · e776f3da
  Script Kiddy authored Dec 15, 2021
  
  e776f3da
14 Dec, 2021 2 commits
- allow launching KIC from about-distro · bb80a771
  Harald Sitter authored Dec 14, 2021
  
  bb80a771
- Fix formatting of X-KDE-OnlyShowOnQtPlatforms json entry · 01c039cd
  Alexander Lohnau authored Dec 14, 2021
```
We define it as an array, however we had split it with a semicolon as a separator in KService.

With this change we can correctly read it as a QJsonArray
```
  01c039cd
13 Dec, 2021 1 commit
- add keyword "version" · bbaaba41
  Nicolai Weitkemper authored Dec 13, 2021
  
  bbaaba41
08 Dec, 2021 1 commit

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

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"

464f754e

01 Dec, 2021 1 commit

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

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

dc4a45e3

30 Nov, 2021 2 commits
- Update version number for 5.23.4 · 55783f3e
  Jonathan Riddell authored Nov 30, 2021
```
GIT_SILENT
```
  55783f3e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 8fc54312
  Script Kiddy authored Nov 30, 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"
```
  8fc54312
29 Nov, 2021 1 commit

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

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

bdaf5c76

28 Nov, 2021 1 commit

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

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

42241065

27 Nov, 2021 3 commits
- Prefer explicit QVariant constructor · 1827b8da
  ivan tkachenko authored Nov 22, 2021
```
Maybe I just don't like how `return {};` looks.

GIT_SILENT
```
  1827b8da
- Add GitLab CI · 7458b2ec
  Nicolas Fella authored Nov 27, 2021
  
  7458b2ec
- SVN_SILENT made messages (.desktop file) - always resolve ours · 417e065c
  Script Kiddy authored Nov 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"
```
  417e065c
25 Nov, 2021 2 commits

Always display vendor & product IDs in left-padded 4-digit format · 5121cea0

ivan tkachenko authored Nov 12, 2021

Unfortunately, C++ (and consequently Qt) lacks sane string formatting
API, leaving us with the only option: to use a dummy "%1" arg string.

5121cea0

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

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

a00710a3

24 Nov, 2021 1 commit

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

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

f4e9eceb

23 Nov, 2021 1 commit

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

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

3196a385

22 Nov, 2021 2 commits
- GIT_SILENT: allow to show header in qtc6 · 04769019
  Laurent Montel authored Nov 22, 2021
  
  04769019
- SVN_SILENT made messages (.desktop file) - always resolve ours · a309a13a
  Script Kiddy authored Nov 22, 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"
```
  a309a13a
21 Nov, 2021 5 commits
- Remove unneeded X-KDE-ParentApp from kcm metadata files · 47444444
  Alexander Lohnau authored Oct 30, 2021
```
This was used by the KServiceTypeTrader filter mechanism, however it is unneeded
with the KCMs being installed in a KInfoCenter specific namespace.
```
  47444444
- Remove uneeded ServiceTypes definition from kcm metadata files · 6f9f0503
  Alexander Lohnau authored Oct 30, 2021
```
Task: https://phabricator.kde.org/T14483
```
  6f9f0503
- Remove obsolete desktop files · 4882ddd4
  Alexander Lohnau authored Nov 21, 2021
  
  4882ddd4
- Convert desktop files to JSON · e1590dcd
  Alexander Lohnau authored Nov 21, 2021
  
  e1590dcd
- Drop code for desktop to json conversion · 4f509ac2
  Alexander Lohnau authored Oct 30, 2021
```
This is not needed since the files are in-source converted to json
```
  4f509ac2
15 Nov, 2021 1 commit

De-duplicate metadata for QML KPackages · 0962f6b5

Alexander Lohnau authored Nov 15, 2021

This way the embedded json metadata of the C++ plugins will be used instead.

By moving the main.qml file to a "ui"-subfolder we don't need to
configure the paths for the mainscript, but can just use the defaults.

To test this change, all the KCMs packages in "PREFIX/share/kpackage/kcms/"
should be removed. Otherwise we might have some leftovers lying around.

0962f6b5

13 Nov, 2021 1 commit

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

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"

c65477c8

11 Nov, 2021 1 commit

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

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

5be3b7f8

09 Nov, 2021 2 commits
- Update version number for 5.23.3 · 537eb3b2
  Jonathan Riddell authored Nov 09, 2021
```
GIT_SILENT
```
  537eb3b2
- Center loading spinner and placeholder message · c44056bd
  Nate Graham authored Nov 08, 2021
  
  c44056bd
07 Nov, 2021 1 commit

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

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

3862722e