Commits · master · PIM / KPeople Sink Backend

07 Jul, 2022 1 commit

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

Script Kiddy authored Jul 07, 2022

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"

4f129cb1

21 May, 2022 1 commit

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

Script Kiddy authored May 21, 2022

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"

8f642486

22 Apr, 2022 1 commit

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

Script Kiddy authored Apr 22, 2022

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"

9d18ae62

01 Apr, 2022 1 commit

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

Script Kiddy authored Apr 01, 2022

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"

9a75f7bd

06 Feb, 2022 1 commit

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

Script Kiddy authored Feb 06, 2022

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"

5d5e1b93

05 Oct, 2021 1 commit

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

Script Kiddy authored Oct 05, 2021

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"

9e498117

23 Sep, 2021 1 commit

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

Script Kiddy authored Sep 23, 2021

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"

b79c4aff

08 Sep, 2021 1 commit

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

Script Kiddy authored Sep 08, 2021

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"

69c548ab

07 Sep, 2021 1 commit

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

Script Kiddy authored Sep 07, 2021

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"

792e3126

12 Aug, 2021 1 commit

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

Script Kiddy authored Aug 12, 2021

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"

54b653d2

07 Aug, 2021 1 commit

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

Script Kiddy authored Aug 07, 2021

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"

1a47210c

20 Jul, 2021 1 commit

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

Script Kiddy authored Jul 20, 2021

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"

59cc131b

28 Jun, 2021 1 commit

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

Script Kiddy authored Jun 28, 2021

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"

889321f7

12 Jun, 2021 1 commit
- Cleanup cmake code and update requirements · 9533e234
  Nicolas Fella authored Feb 07, 2021
```
Remove unneeded cmake code
Update requirements to Plasma standard.
```
  9533e234
03 May, 2021 1 commit

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

Script Kiddy authored May 03, 2021

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"

27b72f4d

24 Feb, 2021 1 commit
- Convert license headers to SPDX · 6f382e61
  Nicolas Fella authored Feb 07, 2021
  
  6f382e61
07 Feb, 2021 1 commit
- rerun clang-format · 23aa4b10
  Nicolas Fella authored Feb 07, 2021
  
  23aa4b10
05 Feb, 2021 1 commit

Possible workaround for the crash on kpeoplesink · 1147d13e

Bhushan Shah authored Feb 04, 2021 and

Bhushan Shah committed Feb 05, 2021

- Do not register notifier before we finish processing the initial list
of contacts
- Add guard for duplicated contacts URIs in the initial fetch of list

1147d13e

31 Jan, 2021 1 commit

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

Script Kiddy authored Jan 31, 2021

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"

d5b42b27

24 Jan, 2021 1 commit

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

Script Kiddy authored Jan 24, 2021

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"

9c14f17c

29 Nov, 2020 1 commit

datasource: when we do not have any address book don't crash · f36afbb2

Bhushan Shah authored Nov 29, 2020

This means user did not set up the account through kaccounts, for
syncing which is why sink does not have any addressbook, let's not try
to add contact to non-existing address book

f36afbb2

28 Sep, 2020 1 commit

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

Script Kiddy authored Sep 28, 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"

cc9ed645

25 Sep, 2020 1 commit

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

Script Kiddy authored Sep 25, 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"

efda429e

06 Sep, 2020 1 commit

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

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

687b0297

24 Jul, 2020 1 commit

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

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

f30fdc46

07 Jul, 2020 1 commit

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

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

42b66859

18 Jun, 2020 1 commit

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

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"

ee59e02f

17 Jun, 2020 1 commit

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

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

66459f35

15 Jun, 2020 1 commit

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

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

57d17868

10 Jun, 2020 1 commit

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

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

a84d1046

09 Jun, 2020 1 commit

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

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

08f12565

23 Apr, 2020 1 commit

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

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

20aabaec

17 Mar, 2020 1 commit

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

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

010849aa

11 Mar, 2020 1 commit

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

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

84004d6f

08 Mar, 2020 1 commit

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

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

a62e871b

04 Mar, 2020 1 commit

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

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

19792a42

01 Mar, 2020 4 commits
- Mark functions as override · 2f950c9b
  Nicolas Fella authored Mar 01, 2020
  
  2f950c9b
- Fix container detach · a26f278a
  Nicolas Fella authored Mar 01, 2020
  
  a26f278a
- Fix unused warnings · e80ce708
  Nicolas Fella authored Mar 01, 2020
  
  e80ce708
- Remove unneeded selectService · 67c6c803
  Nicolas Fella authored Mar 01, 2020
  
  67c6c803