Commits · d8ce66263ba6e39d5b578821aa83acffbe75e0f9 · PIM / KDE PIM Add-ons

30 May, 2016 4 commits
- More info · d8ce6626
  Laurent Montel authored May 30, 2016
  
  d8ce6626
- Add more autotests · 15dbee77
  Laurent Montel authored May 30, 2016
  
  15dbee77
- Use Icon here · 17da5a39
  Laurent Montel authored May 30, 2016
  
  17da5a39
- Add support to load icon · 3cc4aa0c
  Laurent Montel authored May 30, 2016
  
  3cc4aa0c
29 May, 2016 3 commits
- Remove comment · aec8b2cf
  Laurent Montel authored May 29, 2016
  
  aec8b2cf
- Allow to return in reply to · b5228c2d
  Laurent Montel authored May 29, 2016
  
  b5228c2d
- Allow to hide/show action in headerstyle · d41a0589
  Laurent Montel authored May 29, 2016
  
  d41a0589
27 May, 2016 2 commits
- Add settings to show or not mail action · 3924ce72
  Laurent Montel authored May 27, 2016
  
  3924ce72
- USe grantleetheme pointer · 1b973a20
  Laurent Montel authored May 27, 2016
  
  1b973a20
26 May, 2016 1 commit

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

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

35d9655d

25 May, 2016 9 commits
- Add title · 1de372d9
  Laurent Montel authored May 25, 2016
  
  1de372d9
- Use QTEST_APPLESS_MAI · b95d759c
  Laurent Montel authored May 25, 2016
  
  b95d759c
- Remove unused test · 2dddefe3
  Laurent Montel authored May 25, 2016
  
  2dddefe3
- Merge branch 'Applications/16.04' · d53a17a8
  Luca Beltrame authored May 25, 2016
```
Laurent, please check I didn't mess up anything...

CCMAIL: montel@kde.org

 Conflicts:
	CMakeLists.txt [version numbers]
	examples/apps/mailreader/org.kde.akonadimailreader.desktop
        [scripty]
```
  d53a17a8
- Relicense adblock code as GPLv2+ to remove license conflict · e4bcb6ce
  Luca Beltrame authored May 25, 2016
```
David Rosca (author of the adblock library) agreed to the relicensing.
Laurent Montel agreed to the relicensing.

CCMAIL: montel@kde.org
CCMAIL: kde-pim@kde.org
CCMAIL: nowrep@gmail.com
```
  e4bcb6ce
- Make it compiles · bf67dd1a
  Laurent Montel authored May 25, 2016
  
  bf67dd1a
- Time to increase version · 30470327
  Laurent Montel authored May 25, 2016
  
  30470327
- Fix some license · 348bf118
  Laurent Montel authored May 25, 2016
  
  348bf118
- Relicense some files · d4c20cb1
  Laurent Montel authored May 25, 2016
  
  d4c20cb1
23 May, 2016 1 commit
- implement method · 07dfb94c
  Laurent Montel authored May 23, 2016
  
  07dfb94c
20 May, 2016 1 commit
- increase version · fc844cd4
  Laurent Montel authored May 20, 2016
  
  fc844cd4
18 May, 2016 5 commits
- Clean up · 6e745880
  Laurent Montel authored May 18, 2016
  
  6e745880
- indent · b1095876
  Laurent Montel authored May 18, 2016
  
  b1095876
- Minor optimization · 166a8b7a
  Laurent Montel authored May 18, 2016
  
  166a8b7a
- Astyle kdelibs · 3d54e0e4
  Laurent Montel authored May 18, 2016
  
  3d54e0e4
- Add icons · 9db9eb3b
  Laurent Montel authored May 18, 2016
  
  9db9eb3b
17 May, 2016 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 58a3a07f
  Script Kiddy authored May 17, 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"
```
  58a3a07f
- Fix shortcut · 245caff0
  Laurent Montel authored May 17, 2016
  
  245caff0
16 May, 2016 2 commits

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

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

43472406

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

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

ed8f9d83

14 May, 2016 1 commit

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

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

79789cac

13 May, 2016 3 commits
- Use Q_DECL_OVERRIDE · 1111ae98
  Laurent Montel authored May 13, 2016
  
  1111ae98
- Fix margin · d2675c18
  Laurent Montel authored May 13, 2016
  
  d2675c18
- SVN_SILENT made messages (.desktop file) - always resolve ours · 69a51d98
  Script Kiddy authored May 13, 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"
```
  69a51d98
12 May, 2016 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a0bd2233
  Script Kiddy authored May 12, 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"
```
  a0bd2233
- Remove double margin · 95f2f5b3
  Laurent Montel authored May 12, 2016
  
  95f2f5b3
- Fix Bug 357381 - Search Duplicate Contacts menu item open a wrong dialog · 9829d9b7
  Laurent Montel authored May 12, 2016
```
BUG: 357381
```
  9829d9b7
- Fix correct title · ea5c16e9
  Laurent Montel authored May 12, 2016
```
CCMAIL: 57381
```
  ea5c16e9
11 May, 2016 2 commits
- Remove unused autotests · a546d156
  Laurent Montel authored May 11, 2016
  
  a546d156
- Add bcc support · 529dd29c
  Laurent Montel authored May 11, 2016
  
  529dd29c