Commits · b1444a2c40b2d292bf2cd0fb493de4c4e6224679 · PIM / KDE PIM Add-ons

11 May, 2022 1 commit
- auto * -> auto · b1444a2c
  Laurent Montel authored May 11, 2022
  
  b1444a2c
08 May, 2022 1 commit

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

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

9225ab34

04 May, 2022 1 commit
- Remove duplicate header between header cpp file · 69f6f694
  Laurent Montel authored May 04, 2022
  
  69f6f694
03 May, 2022 2 commits
- GIT_SILENT: compile fine without deprecated kf5.94 method · eac1649d
  Laurent Montel authored May 03, 2022
  
  eac1649d
- GIT_SILENT: exclude .xml file · 9e99f0bd
  Laurent Montel authored May 03, 2022
  
  9e99f0bd
28 Apr, 2022 2 commits
- Add missing include · d0dbd011
  Nicolas Fella authored Apr 28, 2022
  
  d0dbd011
- [korganizer/plugins] Embed JSON metadata and install to korganizer namespace · 125e7d84
  Nicolas Fella authored Apr 20, 2022
  
  125e7d84
27 Apr, 2022 1 commit
- It's not messageview here · 34443613
  Laurent Montel authored Apr 27, 2022
  
  34443613
19 Apr, 2022 1 commit

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

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"

9bc03daf

18 Apr, 2022 1 commit
- Also show PDF417 and Code128 pkpass barcodes · ecd7b660
  Volker Krause authored Apr 18, 2022
```
Meanwhile Prison supports those too.
```
  ecd7b660
15 Apr, 2022 2 commits
- GIT_SILENT: fix typo reported by codespell · c95059d9
  Laurent Montel authored Apr 15, 2022
  
  c95059d9
- GIT_SILENT: add codespell settings · 126bf866
  Laurent Montel authored Apr 15, 2022
  
  126bf866
12 Apr, 2022 1 commit
- GIT_SILENT: time to increase version · fa2d1924
  Laurent Montel authored Apr 12, 2022
  
  fa2d1924
10 Apr, 2022 1 commit
- Use same dep as kleopatra · 6f50034f
  Laurent Montel authored Apr 10, 2022
  
  6f50034f
06 Apr, 2022 4 commits
- Merge remote-tracking branch 'origin/release/22.04' · adafe44e
  Laurent Montel authored Apr 06, 2022
  
  adafe44e
- Update color when theme changed · af3bb5f9
  Laurent Montel authored Apr 06, 2022
  
  af3bb5f9
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7dc393ef
  Script Kiddy authored Apr 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"
```
  7dc393ef
- SVN_SILENT made messages (.desktop file) - always resolve ours · 8fe9bff2
  Script Kiddy authored Apr 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"
```
  8fe9bff2
05 Apr, 2022 2 commits

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

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

e7286205

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

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

c2ee10fe

04 Apr, 2022 3 commits
- Merge remote-tracking branch 'origin/release/22.04' · f0300f78
  Volker Krause authored Apr 04, 2022
  
  f0300f78
- SVN_SILENT made messages (.desktop file) - always resolve ours · cdf7706c
  Script Kiddy authored Apr 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"
```
  cdf7706c
- SVN_SILENT made messages (.desktop file) - always resolve ours · bb44081b
  Script Kiddy authored Apr 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"
```
  bb44081b
03 Apr, 2022 2 commits

Extract HTML parts based on decoded text, not raw data · 9492fa31
Volker Krause authored Apr 03, 2022
```
This matters when a non-Unicode text encoding is applied on the MIME
rather than the HTML level.
```
9492fa31

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

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

3e3bb0f8

01 Apr, 2022 5 commits
- It's an alpha version · bddd0a37
  Laurent Montel authored Apr 01, 2022
  
  bddd0a37
- use same lib as kmail/libkleo · 49020000
  Laurent Montel authored Apr 01, 2022
  
  49020000
- GIT_SILENT: make sure that it builds without deprecated method · a20c3226
  Laurent Montel authored Apr 01, 2022
  
  a20c3226
- SVN_SILENT made messages (.desktop file) - always resolve ours · e8c5e8b7
  Script Kiddy authored Apr 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"
```
  e8c5e8b7
- SVN_SILENT made messages (.desktop file) - always resolve ours · 003caf2d
  Script Kiddy authored Apr 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"
```
  003caf2d
29 Mar, 2022 3 commits
- Adapt include for 5.93 · e69545b7
  Laurent Montel authored Mar 29, 2022
  
  e69545b7
- SVN_SILENT made messages (.desktop file) - always resolve ours · ae571028
  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"
```
  ae571028
- SVN_SILENT made messages (.desktop file) - always resolve ours · 50d23065
  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"
```
  50d23065
26 Mar, 2022 1 commit

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

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"

04b663c5

25 Mar, 2022 3 commits
- Const'ify variable · 38eaebf9
  Laurent Montel authored Mar 25, 2022
  
  38eaebf9
- Merge remote-tracking branch 'origin/release/22.04' · 0d2dae89
  Laurent Montel authored Mar 25, 2022
  
  0d2dae89
- Add clear button · 021708b9
  Laurent Montel authored Mar 25, 2022
  
  021708b9
23 Mar, 2022 3 commits
- GIT_SILENT: master is open · 773b6f6a
  Laurent Montel authored Mar 23, 2022
  
  773b6f6a
- SVN_SILENT made messages (.desktop file) - always resolve ours · 63d99597
  Script Kiddy authored Mar 23, 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"
```
  63d99597
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9533cf4a
  Script Kiddy authored Mar 23, 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"
```
  9533cf4a