Commits · master · Plasma / Activity manager service

14 Jan, 2022 2 commits
- Revert "Use SYSTEMD_USER_UNIT_INSTALL_DIR" · d52963cd
  Laurent Montel authored Jan 14, 2022
```
This reverts commit 55d95f26.
```
  d52963cd
- Use SYSTEMD_USER_UNIT_INSTALL_DIR · 55d95f26
  Laurent Montel authored Jan 14, 2022
  
  55d95f26
12 Jan, 2022 1 commit
- It will be removed in qt6 · f879bde7
  Laurent Montel authored Jan 12, 2022
  
  f879bde7
16 Dec, 2021 1 commit

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

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"

24398d96

15 Dec, 2021 1 commit

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

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"

837fbea3

24 Nov, 2021 1 commit

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

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"

c66bf75a

26 Oct, 2021 1 commit
- GIT_SILENT: add missing overide · 3ad18a6c
  Laurent Montel authored Oct 26, 2021
  
  3ad18a6c
11 Oct, 2021 2 commits
- Fix build by lowering KDE_COMPILERSETTINGS_LEVEL · 242b7cf8
  Nicolas Fella authored Oct 11, 2021
```
It doesn't build against the stricter 5.85 level
```
  242b7cf8
- Update kf5 version requirement to 5.86 · 73512c8c
  Jonathan Riddell authored Oct 11, 2021
```
GIT_SILENT
```
  73512c8c
06 Oct, 2021 1 commit
- Add FreeBSD CI · 6f8443a3
  Nicolas Fella authored Oct 07, 2021
  
  6f8443a3
05 Oct, 2021 2 commits
- Add Linux CI · 23f7802a
  Nicolas Fella authored Oct 05, 2021
  
  23f7802a
- Add .kde-ci.yml · 3ddf38ea
  Nicolas Fella authored Oct 05, 2021
  
  3ddf38ea
06 Sep, 2021 1 commit

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

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

861e5cc9

01 Sep, 2021 1 commit

desktop switch support for wayland · 73e9cb57

David Redondo authored Jul 22, 2021 and

David Edmundson committed Sep 01, 2021

While KWindowSystem does not support virtual desktops on wayland
we can just use the dbus interface of kwin.
BUG:439183
FIXED-IN:5.23

73e9cb57

26 Aug, 2021 1 commit

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

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

6536521a

20 Aug, 2021 2 commits
- Port away from deprecated KPluginLoader · ad92ddea
  Nicolas Fella authored Aug 19, 2021
  
  ad92ddea
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5e7a59af
  Script Kiddy authored Aug 20, 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"
```
  5e7a59af
13 Aug, 2021 1 commit

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

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

e8b063d6

08 Aug, 2021 1 commit

krunner plugin: Avoid querying DBus runner unnecessarily · 7dba4f74

Alexander Lohnau authored Apr 15, 2021

From discussion in https://phabricator.kde.org/T12031#250213.

Depends on
frameworks/krunner!59 to be able
to set these properties at runtime.

7dba4f74

05 Aug, 2021 1 commit

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

Script Kiddy authored Aug 05, 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"

2977ccb4

28 Jul, 2021 2 commits

Clean up unneeded JSON parameter in kcoreaddons_add_plugin · b3214fac

Alexander Lohnau authored Jul 28, 2021

The moc process already rebuilds the plugin when the JSON file changes, consequently the additional parameter is not needed.

Task: https://phabricator.kde.org/T14649

b3214fac

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

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

b4b0fece

27 Jul, 2021 1 commit

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

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

c237fe50

26 Jul, 2021 1 commit

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

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

78a45c8d

22 Jul, 2021 1 commit
- Port from KPluginLoader::pluginsById to KPluginMetaData::pluginById · bfe6f098
  Nicolas Fella authored Jul 23, 2021
```
The latter gives us only a single plugin which makes the code a bit more concise
```
  bfe6f098
05 Jun, 2021 1 commit

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

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

9cabb88c

04 Jun, 2021 1 commit

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

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

6d246576

30 May, 2021 1 commit
- Use version-less qt DBus macros · 065fe367
  Nicolas Fella authored May 31, 2021
```
They work with both Qt5 and Qt6
```
  065fe367
19 May, 2021 2 commits
- Clean up ServiceType property usage for JSON based plugins · 11be786e
  Alexander Lohnau authored May 19, 2021
```
Task: https://phabricator.kde.org/T14483
```
  11be786e
- Remove empty dependencies value of JSON plugin metadata · 2ed301c9
  Alexander Lohnau authored May 19, 2021
```
An empty list has no effect and the concept of plugin dependencies will
go away in KF6.

Task: https://phabricator.kde.org/T13553
```
  2ed301c9
17 May, 2021 1 commit

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

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

d707133a

15 May, 2021 1 commit
- GIT_SILENT Remove obsolete KRunner property · ef5a5aaf
  Alexander Lohnau authored May 15, 2021
  
  ef5a5aaf
13 May, 2021 1 commit
- Update kf5 version requirement to 5.82 · 89ed4b85
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  89ed4b85
08 May, 2021 1 commit

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

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

7d9cdb6b

07 May, 2021 1 commit

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

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

450ace3a

03 May, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · 4bd3df8c
  Alexander Lohnau authored May 03, 2021
  
  4bd3df8c
30 Apr, 2021 1 commit

sqlite: Include sqlite error as crash error message · 4c0bd932

Aleix Pol Gonzalez authored Apr 30, 2021

At the moment it's only printing the issue as a warning, this will
include it in the backtrace, making it a bit easier to share when you
report.

I keep having this crash and I have no idea what's wrong.

4c0bd932

20 Apr, 2021 1 commit

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

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

25bf04d9

17 Apr, 2021 1 commit

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

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

bad1bce0

15 Apr, 2021 1 commit

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

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

7cdd9c31