Commits · 047193ce27d385844af2ee1035340302f247f84e · PIM / libkleo

04 May, 2016 1 commit
- Add categories · 047193ce
  Laurent Montel authored May 04, 2016
  
  047193ce
02 May, 2016 1 commit

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

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

9afab77a

29 Apr, 2016 1 commit

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

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"

7bc338f3

27 Apr, 2016 1 commit

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

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

7615ebd2

26 Apr, 2016 1 commit
- Simplify update version · e0c78c63
  Laurent Montel authored Apr 26, 2016
  
  e0c78c63
25 Apr, 2016 1 commit

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

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

ea6ed983

24 Apr, 2016 1 commit

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

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

6063e08f

23 Apr, 2016 1 commit

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

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

d910b531

21 Apr, 2016 1 commit

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

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

557fee78

20 Apr, 2016 1 commit

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

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

53a70c1a

19 Apr, 2016 1 commit

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

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

bcb1541b

18 Apr, 2016 1 commit

Add default filter for certificate type · ae3fa976

Andre Heinecke authored Apr 18, 2016

This allows to filter for OpenPGP or X509 and consequently to
configure the apperance of the different types of certificates.

ae3fa976

30 Mar, 2016 2 commits
- Merge remote-tracking branch 'origin/Applications/16.04' · a7a9f668
  Laurent Montel authored Mar 30, 2016
  
  a7a9f668
- We need to search boost · 8d10bf88
  Laurent Montel authored Mar 30, 2016
  
  8d10bf88
20 Mar, 2016 1 commit
- master is open · a2bdb062
  Laurent Montel authored Mar 20, 2016
  
  a2bdb062
13 Mar, 2016 1 commit
- Prepare 16.04 · dfff38fb
  Laurent Montel authored Mar 13, 2016
  
  dfff38fb
19 Feb, 2016 1 commit

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

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

a36b8aa5

18 Feb, 2016 1 commit
- increase version · 74481ab9
  Laurent Montel authored Feb 18, 2016
  
  74481ab9
03 Feb, 2016 1 commit

Make kpimtextedit dependency private again · 3c7255c6

Andre Heinecke authored Feb 03, 2016

Commit 9fd49322 mistakenly declared PimTextEdit as
PUBLIC dependency.
Thanks to Andreas Sturmlechner for pointing this out.

3c7255c6

30 Jan, 2016 1 commit

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

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"

3668a343

28 Jan, 2016 1 commit
- Let KDE*CompilerSettings change the policies in the project · 9b616ef1
  Aleix Pol Gonzalez authored Jan 28, 2016
```
As suggested in ECM documentation.
```
  9b616ef1
23 Jan, 2016 1 commit

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

Script Kiddy authored Jan 23, 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"

94095330

22 Jan, 2016 4 commits

Remove dependency to KIconLoader · 9b31a41d

Andre Heinecke authored Jan 22, 2016

The icon loading in the keyselectiondialog already works due
to the iconPath function. No need for custom loading.
Auditlogviewer can use QIcon::fromTheme (or the default QDialog
Button icon for close)

9b31a41d

Remove last KDEPIM_ONLY_KLEO occurances · f87014d2

Andre Heinecke authored Jan 22, 2016

If not building the Chiasmusbackend is still required this should
be a clear build option. KDEPIM_ONLY_KLEO was a hack.

f87014d2

Add small test app for Auditlogviewer · 2dfb1446
Andre Heinecke authored Jan 22, 2016
```
Can be used to show a typical Auditlog in libkleos Auditlogviewer.
```
2dfb1446

Make PimTextEdit dependency optional · 9fd49322

Andre Heinecke authored Jan 22, 2016

PimTextEdit pulls in lots of frameworks that are not needed
by libkleo in general so we make it optional. If libkleo is
used from a PIM Application it makes sense to include
pimtextedit. But otherwise QTextEdit is completely
fine for the Auditlog.

9fd49322

16 Jan, 2016 1 commit
- increase version · 4e57f2f0
  Laurent Montel authored Jan 16, 2016
  
  4e57f2f0
10 Jan, 2016 1 commit

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

Script Kiddy authored Jan 10, 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"

3f24d2e4

08 Jan, 2016 1 commit

Cleanup dependencies · baefa5bb

Andre Heinecke authored Jan 08, 2016

This removes dependencies which are not used by libkleo.
It also removes the extra dependency handling when
KDEPIM_ONLY_KLEO is set.

baefa5bb

05 Jan, 2016 1 commit

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

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

050fb07c

02 Jan, 2016 1 commit
- Update copyright · c3c2949a
  Laurent Montel authored Jan 02, 2016
  
  c3c2949a
30 Dec, 2015 1 commit
- Clean up · 2e6b89c6
  Laurent Montel authored Dec 30, 2015
  
  2e6b89c6
27 Dec, 2015 1 commit

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

Script Kiddy authored Dec 27, 2015

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"

cd9a2ae7

24 Dec, 2015 1 commit

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

Script Kiddy authored Dec 24, 2015

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"

82884f38

22 Dec, 2015 3 commits
- Put as last line · aed17719
  Laurent Montel authored Dec 22, 2015
  
  aed17719
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6afccc0d
  Script Kiddy authored Dec 22, 2015
```
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"
```
  6afccc0d
- increase version · 92739b04
  Laurent Montel authored Dec 22, 2015
  
  92739b04
21 Dec, 2015 1 commit

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

Script Kiddy authored Dec 21, 2015

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"

5f3bc8c6

19 Dec, 2015 1 commit

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

Script Kiddy authored Dec 19, 2015

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"

25c3d491

17 Dec, 2015 1 commit

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

Script Kiddy authored Dec 17, 2015

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"

be943d9c