Commits · 520251005f48329da99d98d406733d1d377edfbd · PIM / KDE PIM Add-ons

04 Jul, 2017 3 commits
- increase version · 52025100
  Laurent Montel authored Jul 04, 2017
  
  52025100
- not necessary to create private class · 8de7bd57
  Laurent Montel authored Jul 04, 2017
  
  8de7bd57
- SVN_SILENT made messages (.desktop file) - always resolve ours · 25a6b460
  Script Kiddy authored Jul 04, 2017
```
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"
```
  25a6b460
03 Jul, 2017 1 commit
- Minor · ba79bf53
  Laurent Montel authored Jul 03, 2017
  
  ba79bf53
02 Jul, 2017 1 commit

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

Script Kiddy authored Jul 02, 2017

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"

dab5a54b

01 Jul, 2017 1 commit

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

Script Kiddy authored Jul 01, 2017

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"

249c9b62

30 Jun, 2017 3 commits
- Clean up. Fix update ok button · 226e34ef
  Laurent Montel authored Jun 30, 2017
  
  226e34ef
- Make it compiles · 248fba61
  Laurent Montel authored Jun 30, 2017
  
  248fba61
- Adapt to new api · c011d7ae
  Laurent Montel authored Jun 30, 2017
  
  c011d7ae
29 Jun, 2017 9 commits
- Create dialogbox · 8c1ecba5
  Laurent Montel authored Jun 29, 2017
  
  8c1ecba5
- Add config dialogbox · 2951f6f7
  Laurent Montel authored Jun 29, 2017
  
  2951f6f7
- Compile widget · 112df162
  Laurent Montel authored Jun 29, 2017
  
  112df162
- Activate sendmailjob · e15b6524
  Laurent Montel authored Jun 29, 2017
  
  e15b6524
- Fix coding style · 7188e7e1
  Laurent Montel authored Jun 29, 2017
  
  7188e7e1
- Increase version · f1313b97
  Laurent Montel authored Jun 29, 2017
  
  f1313b97
- Add description · 5e8f5134
  Laurent Montel authored Jun 29, 2017
  
  5e8f5134
- Extract messages · 7efd9b75
  Laurent Montel authored Jun 29, 2017
  
  7efd9b75
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9b1e9284
  Script Kiddy authored Jun 29, 2017
```
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"
```
  9b1e9284
27 Jun, 2017 7 commits
- Fix api · b5eb591a
  Laurent Montel authored Jun 27, 2017
  
  b5eb591a
- Add name · 5b95bd66
  Laurent Montel authored Jun 27, 2017
  
  5b95bd66
- Allow to translate · 671d68c2
  Laurent Montel authored Jun 27, 2017
  
  671d68c2
- Start to create sendmail transport · 463a9ca8
  Laurent Montel authored Jun 27, 2017
  
  463a9ca8
- Add future sendmail plugin · b4969ccd
  Laurent Montel authored Jun 27, 2017
  
  b4969ccd
- Add kmailtransport directory · aa568ddb
  Laurent Montel authored Jun 27, 2017
  
  aa568ddb
- SVN_SILENT made messages (.desktop file) - always resolve ours · 35bb3491
  Script Kiddy authored Jun 27, 2017
```
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"
```
  35bb3491
26 Jun, 2017 1 commit
- GIT_SILENT: Time to ugrade version · 13e92f7c
  Laurent Montel authored Jun 26, 2017
  
  13e92f7c
21 Jun, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 341eacbe
  Script Kiddy authored Jun 21, 2017
```
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"
```
  341eacbe
- GIT_SILENT: fix copyright · 2cfed646
  Laurent Montel authored Jun 21, 2017
  
  2cfed646
20 Jun, 2017 3 commits
- increase version · 92bb3a51
  Laurent Montel authored Jun 20, 2017
  
  92bb3a51
- It doesn't depend against akonadi · 595d30db
  Laurent Montel authored Jun 20, 2017
  
  595d30db
- Fix with new api · c87d1f3f
  Laurent Montel authored Jun 20, 2017
  
  c87d1f3f
19 Jun, 2017 1 commit

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

Script Kiddy authored Jun 19, 2017

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"

bf1ea604

16 Jun, 2017 2 commits
- pimeventsplugin: fix i18n handling · b7ccabe1
  Pino Toscano authored Jun 16, 2017
```
- extract all the qml files, not just top-level only
- use Java format for qml type, as done elsewhere already
- use i18n() as translation function
```
  b7ccabe1
- Allow to translate string · 4af9276b
  Laurent Montel authored Jun 16, 2017
  
  4af9276b
15 Jun, 2017 1 commit

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

Script Kiddy authored Jun 15, 2017

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"

f3efad4c

14 Jun, 2017 1 commit
- Add parent to menu · a538333d
  Laurent Montel authored Jun 14, 2017
  
  a538333d
13 Jun, 2017 4 commits
- Remove not necessary lib · 9a53f4b0
  Laurent Montel authored Jun 13, 2017
  
  9a53f4b0
- increase version · f394471b
  Laurent Montel authored Jun 13, 2017
  
  f394471b
- Improve plugin · 6d53e017
  Laurent Montel authored Jun 13, 2017
  
  6d53e017
- continue to implement autotest · fc4e41a6
  Laurent Montel authored Jun 13, 2017
  
  fc4e41a6