Commits · 9bf5be20e706997cbc71886da9624580dc556435 · PIM / KMail

07 Feb, 2020 1 commit
- GIT_SILENT: Prepare 5.13.3 · 9bf5be20
  Laurent Montel authored Feb 07, 2020
  
  9bf5be20
06 Feb, 2020 1 commit
- GIT_SILENT made messages (after extraction) · ed670d29
  Script Kiddy authored Feb 06, 2020
  
  ed670d29
04 Feb, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ab06090a
  Script Kiddy authored Feb 04, 2020
```
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"
```
  ab06090a
- GIT_SILENT made messages (after extraction) · be29914b
  Script Kiddy authored Feb 04, 2020
  
  be29914b
03 Feb, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 71711c1f
  Christoph Feck authored Feb 04, 2020
  
  71711c1f
29 Jan, 2020 1 commit

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

Script Kiddy authored Jan 29, 2020

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"

4fc1cd36

22 Jan, 2020 1 commit
- GIT_SILENT: Prepare 5.13.2 · d5701241
  Laurent Montel authored Jan 22, 2020
  
  d5701241
15 Jan, 2020 1 commit
- GIT_SILENT: Prepare 5.13.2 · 2ee9862d
  Laurent Montel authored Jan 15, 2020
  
  2ee9862d
10 Jan, 2020 3 commits
- Fix option 'h' is already defined for help (now we can see this option) · de23c361
  Laurent Montel authored Jan 10, 2020
  
  de23c361
- Fix create mail from command line with body as utf8 · dae42249
  Laurent Montel authored Jan 10, 2020
  
  dae42249
- Make sure that we show active windows · ab724451
  Laurent Montel authored Jan 10, 2020
  
  ab724451
09 Jan, 2020 3 commits
- GIT_SILENT: Prepare 5.13.2 · f766fca4
  Laurent Montel authored Jan 09, 2020
  
  f766fca4
- SVN_SILENT made messages (.desktop file) - always resolve ours · e18f5b48
  Script Kiddy authored Jan 09, 2020
```
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"
```
  e18f5b48
- Fix show configure kmail · 03564e7e
  Laurent Montel authored Jan 09, 2020
  
  03564e7e
07 Jan, 2020 1 commit
- Fix change settings. KPIM::PIMMessageBox::fourBtnMsgBox return a QDialogButtonBox:: · 121a6b0a
  Laurent Montel authored Jan 07, 2020
```
not a KMessageBox enum.

Bug found by David

CCMAIL: faure@kde.org
```
  121a6b0a
06 Jan, 2020 1 commit
- Update Appstream for new release · 65decb56
  Christoph Feck authored Jan 06, 2020
  
  65decb56
05 Jan, 2020 1 commit

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

Script Kiddy authored Jan 05, 2020

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"

f31db5b3

29 Dec, 2019 1 commit
- GIT_SILENT: Prepare 5.13.1 · bf99f61a
  Laurent Montel authored Dec 29, 2019
  
  bf99f61a
22 Dec, 2019 1 commit

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

Script Kiddy authored Dec 22, 2019

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"

1aca8ce9

17 Dec, 2019 2 commits
- Fix Bug 415160 - KMail build fails if messagelib is built without Qca-qt5 · f0253059
  Laurent Montel authored Dec 17, 2019
```
FIXED-IN: 5.13.1
BUG: 415160
```
  f0253059
- GIT_SILENT: Prepare 5.13.1 · 218b8cf4
  Laurent Montel authored Dec 17, 2019
  
  218b8cf4
13 Dec, 2019 1 commit

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

Script Kiddy authored Dec 13, 2019

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"

66fc771f

05 Dec, 2019 1 commit
- Update Appstream for new release · cfd52c35
  Christoph Feck authored Dec 05, 2019
  
  cfd52c35
03 Dec, 2019 1 commit
- Don't use nullptr as flag · f027ac7b
  Laurent Montel authored Dec 03, 2019
  
  f027ac7b
02 Dec, 2019 1 commit
- Fix invalid fcc warning when we restore mail · 3c07e090
  Laurent Montel authored Dec 02, 2019
```
Bug found by david
```
  3c07e090
01 Dec, 2019 1 commit
- GIT_SILENT: Prepare 5.13.0 · e4640fc1
  Laurent Montel authored Dec 01, 2019
  
  e4640fc1
30 Nov, 2019 1 commit
- GIT_SILENT: Prepare 5.13.0 · 0ed071b5
  Laurent Montel authored Nov 30, 2019
  
  0ed071b5
28 Nov, 2019 1 commit
- GIT_SILENT: Reduce deprecated version in release · 5094d894
  Laurent Montel authored Nov 28, 2019
  
  5094d894
26 Nov, 2019 1 commit
- GIT_SILENT: Prepare 5.13.0RC · 68f30091
  Laurent Montel authored Nov 26, 2019
  
  68f30091
25 Nov, 2019 2 commits
- Show invalid fcc folder widget · 6eab0be5
  Laurent Montel authored Nov 25, 2019
  
  6eab0be5
- When we use "send again" make sure to assign FCC to current folder. · 3d727807
  Laurent Montel authored Nov 25, 2019
```
it avoids problem when we open this email in another computer
Bug found and discussed with David

CCMAIL: faure@kde.org
```
  3d727807
24 Nov, 2019 1 commit
- GIT_SILENT: Prepare 5.13.0rc · 19cb1de2
  Laurent Montel authored Nov 24, 2019
  
  19cb1de2
21 Nov, 2019 1 commit
- honour notification inhibition by delaying reminders · 9e665614
  Laurent Montel authored Nov 21, 2019
```
As patch as David in korgac
```
  9e665614
17 Nov, 2019 1 commit

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

Script Kiddy authored Nov 17, 2019

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"

d15305c5

16 Nov, 2019 1 commit

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

Script Kiddy authored Nov 16, 2019

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"

d75d5092

15 Nov, 2019 2 commits
- Add missing Q_REQUIRED_RESULT · 5a694070
  Laurent Montel authored Nov 15, 2019
  
  5a694070
- GIT_SILENT: port deprecated methods · 448548fd
  Laurent Montel authored Nov 15, 2019
  
  448548fd
11 Nov, 2019 1 commit

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

Script Kiddy authored Nov 11, 2019

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"

99bc97ca

10 Nov, 2019 2 commits
- GIT_SILENT: Prepare 5.13.0beta1 · 6c2bf068
  Laurent Montel authored Nov 10, 2019
  
  6c2bf068
- GIT_SILENT ensure non-null windowHandle() · 752352a0
  David Faure authored Nov 10, 2019
  
  752352a0