Commits · master · Network / Telepathy Accounts KCM

28 Jul, 2020 1 commit

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

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

a75f2fad

27 Jul, 2020 1 commit

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

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

c6d8fe51

11 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.11.70. · 6d6b4c05
  Albert Astals Cid authored Jul 11, 2020
  
  6d6b4c05
18 Jun, 2020 1 commit

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

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"

b5862daa

17 Jun, 2020 1 commit

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

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"

87c80155

15 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.70. · 0bdd7e4b
  Albert Astals Cid authored Mar 15, 2020
  
  0bdd7e4b
11 Mar, 2020 1 commit
- Use telegram icon for telegram · e7f1105e
  Nicolas Fella authored Mar 11, 2020
  
  e7f1105e
09 Mar, 2020 1 commit
- Merge remote-tracking branch 'origin/release/19.12' · e137edb2
  Albert Astals Cid authored Mar 10, 2020
  
  e137edb2
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · b3eca6d0
  Christoph Feck authored Feb 29, 2020
  
  b3eca6d0
27 Feb, 2020 1 commit

Port disbaled providers to kaccounts macros · 85899798

Nicolas Fella authored Feb 27, 2020

Probably no one will ever care, but it allows us to get rid of the direct intltool usage and the FindAccountsFileDir in kaccounts-integration.

Also introduce a cmake option for enabling the disabled providers

85899798

02 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.2. · e80b5ec0
  Christoph Feck authored Feb 02, 2020
  
  e80b5ec0
19 Jan, 2020 4 commits
- Fix code style (tabs -> spaces) · f779aed3
  Alexander Akulich authored Jan 19, 2020
  
  f779aed3
- Remove unneeded arguments · 1a5de2aa
  Alexander Akulich authored Jan 19, 2020
  
  1a5de2aa
- Use nullptr keyword wherever it makes sense · 9308f106
  Alexander Akulich authored Jan 19, 2020
```
Refactored with clang-tidy
```
  9308f106
- Use override specifiers wherever it makes sense · cad9379d
  Alexander Akulich authored Jan 19, 2020
```
Refactored with clang-tidy
```
  cad9379d
05 Jan, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.1. · a1486fb6
  Christoph Feck authored Jan 05, 2020
  
  a1486fb6
10 Dec, 2019 1 commit
- Change KDE_APPLICATIONS_VERSION to RELEASE_SERVICE_VERSION https://phabricator.kde.org/T11933 · a22a55ff
  Jonathan Riddell authored Dec 10, 2019
```
GIT_SILENT
```
  a22a55ff
05 Dec, 2019 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.0. · da3fc6aa
  Christoph Feck authored Dec 05, 2019
  
  da3fc6aa
26 Nov, 2019 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.11.90. · 0753810f
  Albert Astals Cid authored Nov 26, 2019
  
  0753810f
18 Nov, 2019 2 commits

Fix build with telepathy-qt 0.9.8 · f08680c4

Antonio Rojas authored Nov 18, 2019

Use the new TelepathyQt5::Core link target with 0.9.8, otherwise compilation fails with
/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory

Differential Revision: https://phabricator.kde.org/D25370

f08680c4

Fix build with telepathy-qt 0.9.8 · fbe5097f

Antonio Rojas authored Nov 18, 2019

Use the new TelepathyQt5::Core link target with 0.9.8, otherwise compilation fails with
/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory

Differential Revision: https://phabricator.kde.org/D25370

fbe5097f

10 Nov, 2019 2 commits
- GIT_SILENT Upgrade KDE Applications version to 19.11.80. · a5d66651
  Albert Astals Cid authored Nov 10, 2019
  
  a5d66651
- GIT_SILENT Upgrade KDE Applications version to 20.03.70. · fd5b7567
  Albert Astals Cid authored Nov 10, 2019
  
  fd5b7567
04 Nov, 2019 1 commit

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

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

a1124611

15 Jul, 2019 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.11.70. · ecce3569
  Albert Astals Cid authored Jul 15, 2019
  
  ecce3569
16 Mar, 2019 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.07.70. · 973a849d
  Albert Astals Cid authored Mar 16, 2019
  
  973a849d
06 Jan, 2019 1 commit

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

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

2408704e

18 Nov, 2018 1 commit

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

Script Kiddy authored Nov 18, 2018

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"

ef3b12f2

10 Nov, 2018 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.03.70. · a96edc02
  Albert Astals Cid authored Nov 10, 2018
  
  a96edc02
09 Nov, 2018 1 commit
- GIT_SILENT Upgrade KDE Applications version to 18.03.70. · df3325db
  Albert Astals Cid authored Nov 09, 2018
  
  df3325db
16 Oct, 2018 1 commit

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

Script Kiddy authored Oct 16, 2018

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"

e58ec88d

10 Oct, 2018 1 commit

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

Script Kiddy authored Oct 10, 2018

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"

0c113041

18 Jul, 2018 3 commits
- Unused variable. · 858eccff
  James Smith authored Jul 18, 2018
  
  858eccff
- Compare value. · 0ca72299
  James Smith authored Jul 18, 2018
  
  0ca72299
- Overrides. · ded765b3
  James Smith authored Jul 18, 2018
  
  ded765b3
16 Jul, 2018 1 commit
- GIT_SILENT Upgrade KDE Applications version to 18.11.70. · 3a06050d
  Albert Astals Cid authored Jul 16, 2018
  
  3a06050d
19 Mar, 2018 1 commit
- GIT_SILENT Upgrade KDE Applications version to 18.07.70. · 41c31814
  Albert Astals Cid authored Mar 19, 2018
  
  41c31814
07 Jan, 2018 1 commit

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

Script Kiddy authored Jan 07, 2018

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"

d20f66b2

06 Jan, 2018 1 commit

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

Script Kiddy authored Jan 06, 2018

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"

a82abdf3

05 Jan, 2018 1 commit
- Remove obsolete reviewboardrc file · 01d15c2b
  Laurent Montel authored Jan 05, 2018
  
  01d15c2b