Commits · 1e71967415cf4c99a8e90cee48e1c3c21fb07361 · Plasma / Plasma Firewall

15 Jun, 2022 1 commit
- Request passing unit tests on Linux and BSD · 1e719674
  David Edmundson authored Jun 15, 2022
  
  1e719674
13 Jun, 2022 1 commit

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

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"

4871a702

09 Jun, 2022 1 commit
- Update version number for 5.25.0 · 0b29f4ca
  Jonathan Esk-Riddell authored Jun 09, 2022
```
GIT_SILENT
```
  0b29f4ca
28 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 78094b1d
  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"
```
  78094b1d
- GIT_SILENT made messages (after extraction) · bcf6e85a
  Script Kiddy authored May 28, 2022
  
  bcf6e85a
19 May, 2022 2 commits
- Update version number for 5.25.80 · b10887a8
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  b10887a8
- Update version number for 5.24.90 · 498c3b9e
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  498c3b9e
15 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 35159621
  Script Kiddy authored May 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"
```
  35159621
- GIT_SILENT made messages (after extraction) · ed7cd0f0
  Script Kiddy authored May 15, 2022
  
  ed7cd0f0
04 May, 2022 1 commit
- Remove duplicate header between header cpp file · e4b0126d
  Laurent Montel authored May 04, 2022
  
  e4b0126d
03 May, 2022 1 commit
- Update version number for 5.24.5 · 3b82e7a6
  Jonathan Esk-Riddell authored May 03, 2022
```
GIT_SILENT
```
  3b82e7a6
25 Apr, 2022 4 commits
- Port to non-deprecated KAuth includes · ea46f454
  Volker Krause authored Apr 24, 2022
```
Needed to build with KF deprecation level 5.92 or above.
```
  ea46f454
- const'ify methods · ca069a64
  Laurent Montel authored Apr 25, 2022
  
  ca069a64
- Use Q_SIGNALS · 0a0fa271
  Laurent Montel authored Apr 25, 2022
  
  0a0fa271
- Remove un implemented method · afb73196
  Laurent Montel authored Apr 25, 2022
  
  afb73196
22 Apr, 2022 2 commits
- Fix install in kf<version> · 904fa069
  Laurent Montel authored Apr 22, 2022
  
  904fa069
- Complete the Qt6 port · 4b260010
  Volker Krause authored Apr 22, 2022
```
Most of this is straightforward, the QTextCodec removal can be done as
Qt6 enforces UTF-8 as the local codec on Unix-like systems anyway.
```
  4b260010
21 Apr, 2022 1 commit

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

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

77f59f36

19 Apr, 2022 1 commit

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

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

88a01b22

29 Mar, 2022 2 commits
- Update version number for 5.24.4 · cb5f0e09
  Jonathan Esk-Riddell authored Mar 29, 2022
```
GIT_SILENT
```
  cb5f0e09
- GIT_SILENT made messages (after extraction) · 723b3211
  Script Kiddy authored Mar 29, 2022
  
  723b3211
27 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 8b971efb
  Script Kiddy authored Mar 27, 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"
```
  8b971efb
- GIT_SILENT made messages (after extraction) · 46d29102
  Script Kiddy authored Mar 27, 2022
  
  46d29102
26 Mar, 2022 2 commits
- Fix qt<version> · 59e6b1e2
  Laurent Montel authored Mar 26, 2022
  
  59e6b1e2
- SVN_SILENT made messages (.desktop file) - always resolve ours · 57131f96
  Script Kiddy authored Mar 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"
```
  57131f96
25 Mar, 2022 2 commits
- Fix qt version · 61ed4b93
  Laurent Montel authored Mar 25, 2022
  
  61ed4b93
- Remove unused Plasma Framework dependency · e1e5b797
  Volker Krause authored Mar 25, 2022
  
  e1e5b797
21 Mar, 2022 1 commit

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

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

fa12cff8

11 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f5fb94a1
  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"
```
  f5fb94a1
- GIT_SILENT made messages (after extraction) · 7c53d244
  Script Kiddy authored Mar 11, 2022
  
  7c53d244
08 Mar, 2022 1 commit
- Update version number for 5.24.3 · 5c784f8f
  Jonathan Esk-Riddell authored Mar 08, 2022
```
GIT_SILENT
```
  5c784f8f
05 Mar, 2022 1 commit

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

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

18f80ada

04 Mar, 2022 2 commits
- Adapt build system to build against qt6 · 44a3ccee
  Laurent Montel authored Mar 04, 2022
  
  44a3ccee
- Remove unused X11R6 dep · ec2ee191
  Laurent Montel authored Mar 04, 2022
  
  ec2ee191
22 Feb, 2022 1 commit
- Update version number for 5.24.2 · d650dbcd
  Jonathan Esk-Riddell authored Feb 22, 2022
```
GIT_SILENT
```
  d650dbcd
21 Feb, 2022 2 commits

bugfix 448407 · 5f24d46d

Lucas Biaggi authored Feb 21, 2022 and

Tomaz Canabrava committed Feb 21, 2022

To fix [448407](https://bugs.kde.org/show_bug.cgi?id=448407) we need to parse settings from the active zone and use it as default incoming policy.

5f24d46d

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

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"

a1b5a63c

20 Feb, 2022 1 commit

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

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

c2bc822e

17 Feb, 2022 1 commit

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

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

47caddc9

15 Feb, 2022 1 commit
- Update version number for 5.24.1 · 86707d7e
  Jonathan Esk-Riddell authored Feb 15, 2022
```
GIT_SILENT
```
  86707d7e