Commits · master · PIM / KDE PIM Add-ons

07 Aug, 2020 3 commits
- Coding style · fd4b9897
  Laurent Montel authored Aug 07, 2020
  
  fd4b9897
- Improve import windows contact file · 10592578
  Laurent Montel authored Aug 07, 2020
  
  10592578
- SVN_SILENT made messages (.desktop file) - always resolve ours · d10e382c
  Script Kiddy authored Aug 07, 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"
```
  d10e382c
06 Aug, 2020 6 commits
- Allow to import several contacts · 79e78308
  Laurent Montel authored Aug 06, 2020
  
  79e78308
- Fix Bug 424940 - Add support for importing Windows contacts from .contact XML files · a9e7aff1
  Laurent Montel authored Aug 06, 2020
```
BUG: 424940
FIXED-IN: 5.16.0
```
  a9e7aff1
- Fix typo · 32c293c1
  Laurent Montel authored Aug 06, 2020
  
  32c293c1
- implement support for photo/Im · 8cc8e5ab
  Laurent Montel authored Aug 06, 2020
  
  8cc8e5ab
- Continue to implement import contact · 5e3f3fc2
  Laurent Montel authored Aug 06, 2020
  
  5e3f3fc2
- SVN_SILENT made messages (.desktop file) - always resolve ours · 67dbba5e
  Script Kiddy authored Aug 06, 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"
```
  67dbba5e
05 Aug, 2020 9 commits
- Continue to implement import windows contact · cbf6e468
  Laurent Montel authored Aug 05, 2020
  
  cbf6e468
- Now we can import address/name · cc642462
  Laurent Montel authored Aug 05, 2020
```
CCBUG: 424940
```
  cc642462
- Prepare autotest · bd7dbb03
  Laurent Montel authored Aug 05, 2020
  
  bd7dbb03
- Continue to implement it · 1bad745a
  Laurent Montel authored Aug 05, 2020
```
CCBUG: 424940
```
  1bad745a
- Move variable where it's useful · a4a17c34
  Laurent Montel authored Aug 05, 2020
  
  a4a17c34
- Prepare autotests · 04d5e8a5
  Laurent Montel authored Aug 05, 2020
  
  04d5e8a5
- Extract import contact file · 0eef3771
  Laurent Montel authored Aug 05, 2020
  
  0eef3771
- Add new testcase · 0e4b3fba
  Laurent Montel authored Aug 05, 2020
  
  0e4b3fba
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6b015c8b
  Script Kiddy authored Aug 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"
```
  6b015c8b
04 Aug, 2020 4 commits
- Fix clazy warning · 8bfefad0
  Laurent Montel authored Aug 04, 2020
  
  8bfefad0
- Fix store valid collection id · abee3f30
  Laurent Montel authored Aug 04, 2020
  
  abee3f30
- Continue to implement import windows contact file · b9befc7f
  Laurent Montel authored Aug 04, 2020
  
  b9befc7f
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2cbb7906
  Script Kiddy authored Aug 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"
```
  2cbb7906
03 Aug, 2020 13 commits
- Fix expire trash · 93656cf3
  Laurent Montel authored Aug 03, 2020
  
  93656cf3
- Continue to implement import windows contact file + add debug category · 5f58c6f2
  Laurent Montel authored Aug 03, 2020
  
  5f58c6f2
- Allow to expire trash · fda1d112
  Laurent Montel authored Aug 03, 2020
  
  fda1d112
- Add TODO · e9a5da7f
  Laurent Montel authored Aug 03, 2020
  
  e9a5da7f
- Rename file · 30d5ae9c
  Laurent Montel authored Aug 03, 2020
  
  30d5ae9c
- Continue to implement import "contact" file · 671fe9ba
  Laurent Montel authored Aug 03, 2020
  
  671fe9ba
- Implement import windows contact · 86facbe2
  Laurent Montel authored Aug 03, 2020
  
  86facbe2
- Improve save element · 1ccb51e7
  Laurent Montel authored Aug 03, 2020
  
  1ccb51e7
- Add example · 748a461f
  Laurent Montel authored Aug 03, 2020
  
  748a461f
- Continue to implement it · b5ac90f9
  Laurent Montel authored Aug 03, 2020
  
  b5ac90f9
- Start to implement windows-contacts import/export support · 77ccb3e7
  Laurent Montel authored Aug 03, 2020
```
CCBUG: 424940
```
  77ccb3e7
- Const'ify · e3f1ff25
  Laurent Montel authored Aug 03, 2020
  
  e3f1ff25
- Use new dependancy · dd1de1d5
  Laurent Montel authored Aug 03, 2020
  
  dd1de1d5
02 Aug, 2020 1 commit
- GIT_SILENT: Compile fine against 5.72 · 093fb1fc
  Laurent Montel authored Aug 02, 2020
  
  093fb1fc
01 Aug, 2020 1 commit

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

Script Kiddy authored Aug 01, 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"

9020665c

30 Jul, 2020 1 commit
- remove unused lib · 7165f3ea
  Laurent Montel authored Jul 30, 2020
  
  7165f3ea
29 Jul, 2020 2 commits
- Continue to impmement expire trash settings · fcfa8efc
  Laurent Montel authored Jul 29, 2020
  
  fcfa8efc
- Fix compile in release mode · 455d8bdc
  Laurent Montel authored Jul 29, 2020
  
  455d8bdc