Commits · master · Plasma / Plasma Thunderbolt Integration

27 Jun, 2022 1 commit
- Update qt5 version requirement to 5.15.2 · 5c15dd88
  Jonathan Esk-Riddell authored Jun 27, 2022
```
GIT_SILENT
```
  5c15dd88
23 Jun, 2022 2 commits
- Request passing unit tests on Linux and BSD · 9472e249
  David Edmundson authored Jun 15, 2022 and Volker Krause committed Jun 23, 2022
  
  9472e249
- Explicitly register QDBusObjectPath as QtDBus meta type · b652a9fa
  Volker Krause authored Jun 16, 2022
```
Necessary for Qt6 to emit signals with QDBusObjectPath arguments.
Fixes the managertest unit test.
```
  b652a9fa
20 Jun, 2022 1 commit
- Remove duplicate headers between cpp/h · f08410a0
  Laurent Montel authored Jun 20, 2022
  
  f08410a0
16 Jun, 2022 1 commit

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

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

ef12dd50

13 Jun, 2022 1 commit

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

Script Kiddy authored Jun 13, 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"

f1af69cc

31 May, 2022 1 commit

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

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

75719e29

28 May, 2022 1 commit

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

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

46e0a912

10 Apr, 2022 1 commit

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

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

7463c2b9

29 Mar, 2022 1 commit

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

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

022c70c8

11 Mar, 2022 1 commit

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

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

a89df5bc

26 Feb, 2022 1 commit

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

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

a04add8b

21 Feb, 2022 1 commit

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

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

054520ba

10 Feb, 2022 1 commit
- GIT_SILENT: we need kf5.90 for building against qt6 · c5e75773
  Laurent Montel authored Feb 10, 2022
  
  c5e75773
09 Feb, 2022 1 commit

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

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

4ad6732d

06 Feb, 2022 1 commit

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

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

a2a0b393

05 Feb, 2022 1 commit

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

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

e9f0f1fd

28 Jan, 2022 2 commits
- Add CI qt6 support · c3f759b3
  Laurent Montel authored Jan 28, 2022
  
  c3f759b3
- Make it compiles against qt6 · 0d584326
  Laurent Montel authored Jan 28, 2022
  
  0d584326
24 Jan, 2022 1 commit

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

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

416f5d7d

12 Jan, 2022 1 commit

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

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

b16fbaed

09 Jan, 2022 1 commit

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

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

9b2b37e6

05 Jan, 2022 1 commit

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

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"

34c7d111

04 Jan, 2022 1 commit

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

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

76969a43

02 Jan, 2022 1 commit

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

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"

0ef52d3a

01 Jan, 2022 1 commit

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

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

7e30a1c6

31 Dec, 2021 1 commit

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

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

f2360607

30 Dec, 2021 1 commit

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

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

c470b27e

29 Dec, 2021 1 commit

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

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

095e18e2

28 Dec, 2021 1 commit

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

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

1e01a58c

27 Dec, 2021 1 commit

Port KCM to new metadata approach · 3a897082

Alexander Lohnau authored Dec 21, 2021

De-duplicate json metadata for package and C++ plugin (https://phabricator.kde.org/T14983).
Convert the metadata for the KCM to JSON (https://phabricator.kde.org/T14564).
Also install the KCm in the namespace for systemsettings, for the integration with the task manager
a desktop file with NoDisplay=true is shipped (https://phabricator.kde.org/T14517).

3a897082

23 Dec, 2021 1 commit

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

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

d4afb3de

12 Dec, 2021 1 commit

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

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

422bacfc

09 Dec, 2021 3 commits
- GIT_SILENT: Use more cmake target centric code · 2d98206d
  Laurent Montel authored Dec 09, 2021
  
  2d98206d
- GIT_SILENT: ignore build dir · b4dbafa8
  Laurent Montel authored Dec 09, 2021
  
  b4dbafa8
- GIT_SILENT: Use same Qt/KF5 version as other workspace apps · ab8445a8
  Laurent Montel authored Dec 09, 2021
  
  ab8445a8
13 Nov, 2021 1 commit

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

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"

579cef83

11 Nov, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 89de5251
  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"
```
  89de5251
- Remove unneeded X-Plasma-API from KCM metadata · 9ad413bb
  Nicolas Fella authored Nov 11, 2021
```
It doesn't serve any purpose
```
  9ad413bb
06 Oct, 2021 1 commit
- Add FreeBSD CI · a265f72a
  Nicolas Fella authored Oct 07, 2021
  
  a265f72a