Commits · 7ff42f659709f8d43dd0b8f807ee9dad1546fc7a · PIM / KDE PIM Add-ons

02 May, 2016 1 commit
- Revert "Remove not necessary linking lib" · 7ff42f65
  Laurent Montel authored May 02, 2016
```
This reverts commit 403aaea3.
```
  7ff42f65
29 Apr, 2016 1 commit

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

Script Kiddy authored Apr 29, 2016

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"

80899619

27 Apr, 2016 2 commits
- Remove not necessary linking lib · 403aaea3
  Laurent Montel authored Apr 27, 2016
  
  403aaea3
- Fix Bug 362100 - No mail headers if kdepim-addons is not installed · 4ae4d6a4
  Laurent Montel authored Apr 27, 2016
  
  4ae4d6a4
07 Apr, 2016 1 commit
- Fix Bug 361173 - Disposition-Notification-To not correctly escaped in message viewer · f88d0935
  Laurent Montel authored Apr 07, 2016
```
BUG: 361173
FIXED-IN: 5.2
```
  f88d0935
04 Apr, 2016 1 commit
- Add KF5::I18n · 1c634487
  Laurent Montel authored Apr 04, 2016
  
  1c634487
31 Mar, 2016 1 commit

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

Script Kiddy authored Mar 31, 2016

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"

0ebf700a

25 Mar, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 5ace95d0
  Script Kiddy authored Mar 25, 2016
  
  5ace95d0
23 Mar, 2016 4 commits
- Fix Bug 360851 - Broken render of emails with another email attached · ae4558e8
  Laurent Montel authored Mar 23, 2016
```
BUG: 360851
(cherry picked from commit ba7039c4)
```
  ae4558e8
- Clean up · 50d44e01
  Laurent Montel authored Mar 23, 2016
```
(cherry picked from commit f2a30981)
```
  50d44e01
- Fix Bug 360851 - Broken render of emails with another email attached · ba7039c4
  Laurent Montel authored Mar 23, 2016
```
BUG: 360851
```
  ba7039c4
- Clean up · f2a30981
  Laurent Montel authored Mar 23, 2016
  
  f2a30981
21 Mar, 2016 2 commits
- Update includes to MimeTreeParser · db512bc1
  Sandro Knauß authored Mar 14, 2016
  
  db512bc1
- Remove new line · 5979c258
  Laurent Montel authored Mar 21, 2016
  
  5979c258
04 Mar, 2016 1 commit

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

Script Kiddy authored Mar 04, 2016

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"

2615fe58

27 Feb, 2016 1 commit

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

Script Kiddy authored Feb 27, 2016

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"

44c64336

22 Feb, 2016 1 commit

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

Script Kiddy authored Feb 22, 2016

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"

8d43e73c

10 Feb, 2016 1 commit
- Bye bye customheaderstyle · efe23bfc
  Laurent Montel authored Feb 10, 2016
  
  efe23bfc
08 Feb, 2016 1 commit

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

Script Kiddy authored Feb 08, 2016

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"

7beacdc2

06 Feb, 2016 1 commit

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

Script Kiddy authored Feb 06, 2016

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"

d2f3f65d

05 Feb, 2016 1 commit

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

Script Kiddy authored Feb 05, 2016

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"

4309aa81

02 Feb, 2016 1 commit

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

Script Kiddy authored Feb 02, 2016

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"

bb4d3715

31 Jan, 2016 4 commits
- Fix load default plugin · 5797b63e
  Laurent Montel authored Jan 31, 2016
  
  5797b63e
- fix load theme · c9a51408
  Laurent Montel authored Jan 31, 2016
  
  c9a51408
- fix load default theme · 271f2312
  Laurent Montel authored Jan 31, 2016
  
  271f2312
- SVN_SILENT made messages (.desktop file) - always resolve ours · db1b9132
  Script Kiddy authored Jan 31, 2016
```
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"
```
  db1b9132
30 Jan, 2016 1 commit

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

Script Kiddy authored Jan 30, 2016

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"

e97f140a

28 Jan, 2016 1 commit
- Astyle kdelibs · e65a3bfa
  Laurent Montel authored Jan 28, 2016
  
  e65a3bfa
27 Jan, 2016 3 commits
- fix copyright · e3ced541
  Laurent Montel authored Jan 27, 2016
  
  e3ced541
- Don't show trash icon when we can't move to trash · e0eeba58
  Laurent Montel authored Jan 27, 2016
  
  e0eeba58
- SVN_SILENT made messages (.desktop file) - always resolve ours · 67339137
  Script Kiddy authored Jan 27, 2016
```
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"
```
  67339137
26 Jan, 2016 9 commits
- Exclude action when we print message · f1c40dda
  Laurent Montel authored Jan 26, 2016
  
  f1c40dda
- Fix icons position · 73c1e52a
  Laurent Montel authored Jan 26, 2016
  
  73c1e52a
- Add more actions · 6115cd6f
  Laurent Montel authored Jan 26, 2016
  
  6115cd6f
- improve theme · 3099fd74
  Laurent Montel authored Jan 26, 2016
  
  3099fd74
- SVN_SILENT made messages (.desktop file) - always resolve ours · 102664e1
  Script Kiddy authored Jan 26, 2016
```
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"
```
  102664e1
- Add action in mail · 62fa615c
  Laurent Montel authored Jan 26, 2016
  
  62fa615c
- Add theme based on "Breeze Flat" We need to refresh a little default theme · 398b8cc4
  Laurent Montel authored Jan 26, 2016
  
  398b8cc4
- Add 5.2 · 324a5adc
  Laurent Montel authored Jan 26, 2016
  
  324a5adc
- Move files · e8452f7d
  Laurent Montel authored Jan 26, 2016
  
  e8452f7d