Commits · d11da7f540f75782327b3c34fbbfa10c958b8c4f · PIM / KDE PIM Runtime

08 Jun, 2017 1 commit

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

Script Kiddy authored Jun 08, 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"

d11da7f5

04 Jun, 2017 1 commit
- Use override here · 110641b2
  Laurent Montel authored Jun 04, 2017
  
  110641b2
03 Jun, 2017 1 commit
- Remove module name · 4bc8fd9e
  Laurent Montel authored Jun 03, 2017
  
  4bc8fd9e
02 Jun, 2017 3 commits
- fix merge from Applications/17.04 · 785ea385
  Pino Toscano authored Jun 03, 2017
  
  785ea385
- Merge branch 'Applications/17.04' · a561526a
  Daniel Vrátil authored Jun 02, 2017
  
  a561526a
- IMAP: allow creating top-level folders it User namespace is empty · 580ef344
  Daniel Vrátil authored Jun 02, 2017
```
If the server does not support namespaces or if the user namespace is empty
then allow creating sub-collections directly under the top-level collection.

BUG: 339567
FIXED-IN: 5.5.2
```
  580ef344
31 May, 2017 1 commit

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

Script Kiddy authored May 31, 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"

36486b72

28 May, 2017 1 commit
- USe nullptr · 8735e17d
  Laurent Montel authored May 28, 2017
  
  8735e17d
27 May, 2017 2 commits

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

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

49586b63

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

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

27d75c0b

26 May, 2017 1 commit
- Increase version · 5459af7c
  Laurent Montel authored May 26, 2017
  
  5459af7c
25 May, 2017 1 commit
- GIT_SILENT: prepare 5.5.2 · 3ded7af3
  Laurent Montel authored May 25, 2017
  
  3ded7af3
24 May, 2017 2 commits

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

Script Kiddy authored May 24, 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"

a3b7598f

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

Script Kiddy authored May 24, 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"

74ef4256

22 May, 2017 2 commits
- Fix Bug 379155 - Imap resources crash when trying to open settings · 611510d0
  Laurent Montel authored Apr 24, 2017
```
BUG: 379155
```
  611510d0
- SVN_SILENT made messages (.desktop file) - always resolve ours · 60c43aca
  Script Kiddy authored May 22, 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"
```
  60c43aca
12 May, 2017 5 commits
- Merge branch 'Applications/17.04' · 0bb5e58d
  Antonio Rojas authored May 12, 2017
  
  0bb5e58d
- Add missing include · e8b131fe
  Antonio Rojas authored May 12, 2017
```
Otherwise WITH_GMAIL_XOAUTH2 is always undefined

BUG: 379155
Differential Revision: https://phabricator.kde.org/D5819
```
  e8b131fe
- GIT_SILENT: 5.5.1 was released · e1effe14
  Laurent Montel authored May 12, 2017
  
  e1effe14
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0e9a8335
  Script Kiddy authored May 12, 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"
```
  0e9a8335
- SVN_SILENT made messages (.desktop file) - always resolve ours · c85dda21
  Script Kiddy authored May 12, 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"
```
  c85dda21
11 May, 2017 2 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · e655fb10
  Laurent Montel authored May 11, 2017
  
  e655fb10
- Enable by default store locally emails · 73bd68ef
  Laurent Montel authored May 11, 2017
  
  73bd68ef
10 May, 2017 2 commits

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

Script Kiddy authored May 10, 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"

f049cdac

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

Script Kiddy authored May 10, 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"

82a517c2

08 May, 2017 1 commit

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

Script Kiddy authored May 08, 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"

0869553c

07 May, 2017 1 commit
- Merge remote-tracking branch 'origin/Applications/17.04' · a6395804
  Laurent Montel authored May 07, 2017
  
  a6395804
06 May, 2017 1 commit

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

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

737bad54

05 May, 2017 1 commit

Fix build with CMake 3.8. · dc031319

Christophe Giboudeaux authored Apr 27, 2017

Before CMake 3.8, automoc'ed files were saved in the build directory.
With CMake 3.8, they're now saved into $targetName_autogen/include and exported
to $targetName's INCLUDE_DIRECTORIES variable.

mailserializertest.cpp #includes akonadi_serializer_mail.cpp
which #includes moc_akonadi_serializer_mail.cpp.

As a result, CMake had no way to guess where where the automoc'ed file is.

(cherry picked from commit e5c26385)

dc031319

03 May, 2017 2 commits
- Port qSort · e88e13d7
  Laurent Montel authored May 03, 2017
  
  e88e13d7
- comment for the moment · 9240de6e
  Laurent Montel authored May 03, 2017
  
  9240de6e
02 May, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4feb8488
  Script Kiddy authored May 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"
```
  4feb8488
- Use more qAsConst · c252c43a
  Laurent Montel authored May 02, 2017
  
  c252c43a
01 May, 2017 3 commits
- GIT_SILENT: prepare 5.5.1 · 01257677
  Laurent Montel authored May 01, 2017
  
  01257677
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5dd6665c
  Script Kiddy authored May 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"
```
  5dd6665c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 72a56134
  Script Kiddy authored May 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"
```
  72a56134
30 Apr, 2017 1 commit

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

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

baaf156d

29 Apr, 2017 3 commits

Avoid KDirWatch problem not stopping watching a dir when told · bed14531
Martin Koller authored Apr 29, 2017
```
Differential Revision: https://phabricator.kde.org/D5653
```
bed14531

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

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

2b372eb2

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

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

62cca94a