Commits · master · PIM / PIM Data Exporter

05 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 740662be
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit bc212ac0)
```
  740662be
02 Aug, 2020 1 commit
- GIT_SILENT: Compile fine against 5.72 · 51d1a702
  Laurent Montel authored Aug 02, 2020
  
  51d1a702
01 Aug, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b6d886b8
  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"
```
  b6d886b8
- GIT_SILENT made messages (after extraction) · a476a6dc
  Script Kiddy authored Aug 01, 2020
  
  a476a6dc
27 Jul, 2020 1 commit
- GIT_SILENT: time to increase version · 3e1580ab
  Laurent Montel authored Jul 27, 2020
  
  3e1580ab
23 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · fa2251b7
  Script Kiddy authored Jul 23, 2020
  
  fa2251b7
13 Jul, 2020 1 commit
- GIT_SILENT: increase dependancy · 0f4bc70b
  Laurent Montel authored Jul 13, 2020
  
  0f4bc70b
12 Jul, 2020 1 commit
- GIT_SILENT: branch is opened · 53908505
  Laurent Montel authored Jul 12, 2020
  
  53908505
10 Jul, 2020 1 commit
- GIT_SILENT: Prepare 5.15 beta1 · ee7395e4
  Laurent Montel authored Jul 10, 2020
  
  ee7395e4
09 Jul, 2020 1 commit
- We will able to overwrite settings in autotest too · 0a51a8a4
  Laurent Montel authored Jul 09, 2020
  
  0a51a8a4
08 Jul, 2020 4 commits
- GIT_SILENT: coding style · 4ef407ac
  Laurent Montel authored Jul 08, 2020
  
  4ef407ac
- Allow to test override in import calendar too · f0cf6696
  Laurent Montel authored Jul 08, 2020
  
  f0cf6696
- Continue to create autotest for overriding config · 58d38f97
  Laurent Montel authored Jul 08, 2020
  
  58d38f97
- GIT_SILENT: It compiles fine against kf5.72 without deprecated methods · 99174d65
  Laurent Montel authored Jul 08, 2020
  
  99174d65
07 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15 beta1 · 2c49b83d
  Laurent Montel authored Jul 07, 2020
  
  2c49b83d
05 Jul, 2020 3 commits
- Fix import addressbook · fe911eeb
  Laurent Montel authored Jul 05, 2020
  
  fe911eeb
- Remove debug · aaf9a4cf
  Laurent Montel authored Jul 05, 2020
  
  aaf9a4cf
- Fix search existing config · dd118398
  Laurent Montel authored Jul 05, 2020
  
  dd118398
03 Jul, 2020 4 commits
- Merge branch 'master' of invent.kde.org:pim/pim-data-exporter · 9894d265
  Christoph Feck authored Jul 04, 2020
  
  9894d265
- GIT_SILENT Update Appstream for new release · c81f9e06
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit a87860b0)
```
  c81f9e06
- Clean up code · 974c3fda
  Laurent Montel authored Jul 03, 2020
  
  974c3fda
- Fix test import · ab8a336c
  Laurent Montel authored Jul 03, 2020
  
  ab8a336c
30 Jun, 2020 4 commits
- Prepare to autotest merge config · 4a0752a0
  Laurent Montel authored Jun 30, 2020
  
  4a0752a0
- Add configLocation() · 04e1ca6a
  Laurent Montel authored Jun 30, 2020
  
  04e1ca6a
- Prepare to autotest merge config · a2a83631
  Laurent Montel authored Jun 30, 2020
  
  a2a83631
- Add debug info · 0eda5854
  Laurent Montel authored Jun 30, 2020
  
  0eda5854
24 Jun, 2020 1 commit
- Fix import rc file · 01253d13
  Laurent Montel authored Jun 24, 2020
  
  01253d13
22 Jun, 2020 5 commits
- Fix mem leak found by asan · c6a62e81
  Laurent Montel authored Jun 22, 2020
  
  c6a62e81
- Improve autotest · 859ef2ca
  Laurent Montel authored Jun 22, 2020
  
  859ef2ca
- Clean forward declaration · e0861ea7
  Laurent Montel authored Jun 22, 2020
  
  e0861ea7
- Clean includes · 18dc1247
  Laurent Montel authored Jun 22, 2020
  
  18dc1247
- Test export rc file · 985313e0
  Laurent Montel authored Jun 22, 2020
  
  985313e0
19 Jun, 2020 4 commits
- Merge remote-tracking branch 'origin/release/20.04' · ff0d483c
  Laurent Montel authored Jun 19, 2020
  
  ff0d483c
- Fix logic · 59581fb5
  Laurent Montel authored Jun 19, 2020
  
  59581fb5
- Fix import ui.rc file · 6bc2bec3
  Laurent Montel authored Jun 19, 2020
  
  6bc2bec3
- Improve autotest · adb241df
  Laurent Montel authored Jun 19, 2020
  
  adb241df
18 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2d122734
  Script Kiddy authored Jun 18, 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"
```
  2d122734
- GIT_SILENT made messages (after extraction) · 80540550
  Script Kiddy authored Jun 18, 2020
  
  80540550
- SVN_SILENT made messages (.desktop file) - always resolve ours · 76a6e9c9
  Script Kiddy authored Jun 18, 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"
```
  76a6e9c9
- GIT_SILENT made messages (after extraction) · e1879cc0
  Script Kiddy authored Jun 18, 2020
  
  e1879cc0