Commits · b9308033b736ed83b5d1da9156eeedde69f06d64 · PIM / PIM Data Exporter

12 Aug, 2019 1 commit
- Remove debug · b9308033
  Laurent Montel authored Aug 12, 2019
  
  b9308033
05 Aug, 2019 1 commit
- GIT_SILENT made messages (after extraction) · f28579cb
  Script Kiddy authored Aug 05, 2019
  
  f28579cb
04 Aug, 2019 3 commits
- GIT_SILENT: Prepare 5.12.0 · d36c825c
  Laurent Montel authored Aug 04, 2019
  
  d36c825c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 76fcc6ed
  Script Kiddy authored Aug 04, 2019
```
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"
```
  76fcc6ed
- GIT_SILENT made messages (after extraction) · 1963cbec
  Script Kiddy authored Aug 04, 2019
  
  1963cbec
03 Aug, 2019 2 commits
- GIT_SILENT: Prepare 5.12.0 · 46d21133
  Laurent Montel authored Aug 03, 2019
  
  46d21133
- Adapt to KCalendarCore namespace change · 4fc96d8a
  Volker Krause authored Aug 03, 2019
  
  4fc96d8a
01 Aug, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4d1dc3bb
  Script Kiddy authored Aug 01, 2019
```
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"
```
  4d1dc3bb
- GIT_SILENT made messages (after extraction) · 384486bb
  Script Kiddy authored Aug 01, 2019
  
  384486bb
31 Jul, 2019 2 commits
- GIT_SILENT: Prepare 5.12.0 rc · 073448eb
  Laurent Montel authored Jul 31, 2019
  
  073448eb
- GIT_SILENT made messages (after extraction) · 24a41452
  Script Kiddy authored Jul 31, 2019
  
  24a41452
24 Jul, 2019 1 commit
- Fix includes, only use the namespace path, not the install prefix · cb18bb6e
  Volker Krause authored Jul 24, 2019
  
  cb18bb6e
23 Jul, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 99cce302
  Script Kiddy authored Jul 23, 2019
  
  99cce302
22 Jul, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 38082cb9
  Script Kiddy authored Jul 22, 2019
```
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"
```
  38082cb9
- GIT_SILENT made messages (after extraction) · 854af6d3
  Script Kiddy authored Jul 22, 2019
  
  854af6d3
19 Jul, 2019 1 commit
- GIT_SILENT: Prepare 5.12.0 rc · 6f50f4f0
  Laurent Montel authored Jul 19, 2019
  
  6f50f4f0
17 Jul, 2019 1 commit

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

Script Kiddy authored Jul 17, 2019

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"

5d0b5a4e

13 Jul, 2019 2 commits
- GIT_SILENT: Prepare 5.11.80 (19.08.0 beta) · c502ff72
  Laurent Montel authored Jul 13, 2019
  
  c502ff72
- GIT_SILENT: Increase dependancy as discussed in release-team@ · 24a44fd8
  Laurent Montel authored Jul 13, 2019
  
  24a44fd8
12 Jul, 2019 1 commit
- GIT_SILENT: Prepare 5.11.80 (19.08.0 beta) · 6545a569
  Laurent Montel authored Jul 12, 2019
  
  6545a569
09 Jul, 2019 1 commit

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

Script Kiddy authored Jul 09, 2019

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"

9afabb78

05 Jul, 2019 1 commit
- GIT_SILENT: increase qt version (we will depend against 5.60 will use qt5.11) · 9530323b
  Laurent Montel authored Jul 05, 2019
  
  9530323b
04 Jul, 2019 9 commits
- GIT_SILENT: coding style · e62dee5b
  Laurent Montel authored Jul 04, 2019
  
  e62dee5b
- Add more check · 54ef4813
  Laurent Montel authored Jul 04, 2019
  
  54ef4813
- Add missing check · 35f8bec0
  Laurent Montel authored Jul 04, 2019
  
  35f8bec0
- Allow to extract file from archive · 49fb7a72
  Laurent Montel authored Jul 04, 2019
  
  49fb7a72
- Add button for extracting file · 68b7578b
  Laurent Montel authored Jul 04, 2019
  
  68b7578b
- Add parent · 01d03761
  Laurent Montel authored Jul 04, 2019
  
  01d03761
- Fix logic for enable/disable button · d04e760d
  Laurent Montel authored Jul 04, 2019
  
  d04e760d
- Store fill full path. Necessary to implement extract files · d2a6887a
  Laurent Montel authored Jul 04, 2019
  
  d2a6887a
- Fix i18n · ecb3f78f
  Laurent Montel authored Jul 04, 2019
  
  ecb3f78f
01 Jul, 2019 5 commits
- Merge remote-tracking branch 'origin/Applications/19.04' · 161d725b
  Laurent Montel authored Jul 01, 2019
  
  161d725b
- Add icons · 39f8c23d
  Laurent Montel authored Jul 01, 2019
  
  39f8c23d
- Fix name · 2f7aa4e3
  Laurent Montel authored Jul 01, 2019
  
  2f7aa4e3
- Merge remote-tracking branch 'origin/Applications/19.04' · d4ed543c
  Laurent Montel authored Jul 01, 2019
  
  d4ed543c
- Add toolbar action for user which uses "global menus" and think that · 02ed9a1b
  Laurent Montel authored Jul 01, 2019
```
apps is broken as they don't look at this "global menus"....
So now we have toolbar actions...
```
  02ed9a1b
25 Jun, 2019 3 commits
- Merge remote-tracking branch 'origin/Applications/19.04' · b66eb2a5
  Laurent Montel authored Jun 25, 2019
  
  b66eb2a5
- Allow to clean "Folder-" group before exporting/importing · 9cb23e0a
  Laurent Montel authored Jun 25, 2019
```
(cherry picked from commit 149e565e)
```
  9cb23e0a
- Allow to clean "Folder-" group before exporting/importing · 149e565e
  Laurent Montel authored Jun 25, 2019
  
  149e565e
24 Jun, 2019 1 commit
- Rename variables · 749df43f
  Laurent Montel authored Jun 24, 2019
  
  749df43f