Commits · eb34071eab32090d8a87582d1d3b9eef302c9f03 · PIM / libksieve

13 May, 2016 1 commit
- Add Q_DECL_OVERRIDE · eb34071e
  Laurent Montel authored May 13, 2016
  
  eb34071e
03 May, 2016 5 commits
- minor optimization · a8ed1d66
  Laurent Montel authored May 03, 2016
  
  a8ed1d66
- Const'ify · 83b8b5b7
  Laurent Montel authored May 03, 2016
  
  83b8b5b7
- Allow to save/load splitter position · 696d3d00
  Laurent Montel authored May 03, 2016
  
  696d3d00
- Add more package info · d2736d6f
  Laurent Montel authored May 03, 2016
  
  d2736d6f
- Coding style · 4e77ae0c
  Laurent Montel authored May 03, 2016
  
  4e77ae0c
02 May, 2016 10 commits
- Merge remote-tracking branch 'origin/Applications/16.04' · 93f41956
  Laurent Montel authored May 02, 2016
  
  93f41956
- Fix Bug 328246 - Manage Sieve scripts feature broken · aa295b6c
  Laurent Montel authored May 02, 2016
```
FIXED-IN: 5.2.1
BUG: 328246
```
  aa295b6c
- Merge remote-tracking branch 'origin/Applications/16.04' · a12178cf
  Laurent Montel authored May 02, 2016
  
  a12178cf
- We need to update originalscript each time that send script is a success · 5602e0af
  Laurent Montel authored May 02, 2016
  
  5602e0af
- Merge remote-tracking branch 'origin/Applications/16.04' · 8a2863a3
  Laurent Montel authored May 02, 2016
  
  8a2863a3
- Rename method · 09e1c12f
  Laurent Montel authored May 02, 2016
  
  09e1c12f
- Increase version · a359e0ba
  Laurent Montel authored May 02, 2016
  
  a359e0ba
- Merge remote-tracking branch 'origin/Applications/16.04' · ae1586ae
  Laurent Montel authored May 02, 2016
  
  ae1586ae
- Rename method, remove unused function · 0dea1438
  Laurent Montel authored May 02, 2016
  
  0dea1438
- Remove duplicate code · 34635bc9
  Laurent Montel authored May 02, 2016
  
  34635bc9
29 Apr, 2016 2 commits
- Merge remote-tracking branch 'origin/Applications/16.04' · 888c93e3
  Laurent Montel authored Apr 29, 2016
  
  888c93e3
- Remove duplicate margin · fbad6a27
  Laurent Montel authored Apr 29, 2016
  
  fbad6a27
26 Apr, 2016 2 commits
- Prepare 5.2.1 · 60915424
  Laurent Montel authored Apr 26, 2016
  
  60915424
- Simplify update version · 6b4167c4
  Laurent Montel authored Apr 26, 2016
  
  6b4167c4
25 Apr, 2016 1 commit

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

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"

1a717f63

21 Apr, 2016 1 commit

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

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"

da75ecae

20 Apr, 2016 1 commit
- Use QtWebengine · 021f44e7
  Laurent Montel authored Apr 20, 2016
  
  021f44e7
18 Apr, 2016 1 commit

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

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

a9f0fc4c

14 Apr, 2016 1 commit
- UI string: fix capitalization · de60d5e9
  Luigi Toscano authored Apr 14, 2016
  
  de60d5e9
12 Apr, 2016 1 commit
- Fix minor typos found by Frederik Schwarzer · 73e15c12
  Yuri Chornoivan authored Apr 12, 2016
  
  73e15c12
11 Apr, 2016 1 commit

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

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

2308e5aa

09 Apr, 2016 1 commit

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

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

773a6cfd

08 Apr, 2016 3 commits
- Prepare 5.2.0 step2 · 49d683d9
  Laurent Montel authored Apr 08, 2016
  
  49d683d9
- SVN_SILENT made messages (.desktop file) - always resolve ours · f6bd122e
  Script Kiddy authored Apr 08, 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"
```
  f6bd122e
- Prepare 5.2.0 · d51f95ed
  Laurent Montel authored Apr 08, 2016
  
  d51f95ed
07 Apr, 2016 1 commit

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

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

cd5e8fcc

06 Apr, 2016 1 commit

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

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

e5e667dd

05 Apr, 2016 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 87c7c18d
  Script Kiddy authored Apr 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"
```
  87c7c18d
- Move here · 6eef4101
  Laurent Montel authored Apr 05, 2016
  
  6eef4101
04 Apr, 2016 2 commits
- Add missing i18n · 6047e473
  Laurent Montel authored Apr 04, 2016
  
  6047e473
- 16.04rc · 2080d8e6
  Laurent Montel authored Apr 04, 2016
  
  2080d8e6
29 Mar, 2016 1 commit

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

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

eac33574

28 Mar, 2016 2 commits
- Fix compile · 7de4cfdd
  Laurent Montel authored Mar 28, 2016
  
  7de4cfdd
- Remove UiTools not necessary · 39c8bdfb
  Laurent Montel authored Mar 28, 2016
  
  39c8bdfb