Commits · e601755644467b151fed5f05ef8aa662542459fe · Network / KDE Connect

10 Jun, 2019 1 commit
- Force usage of QStringLiteral and port remaining offenders · e6017556
  Nicolas Fella authored Jun 10, 2019
  
  e6017556
30 Apr, 2019 1 commit
- Add Macro for MinGW and fix GUID Macro Fix for Windows building · 595e8d9a
  Nicolas Fella authored Apr 30, 2019
  
  595e8d9a
22 Apr, 2019 1 commit
- Use initializer for QJsonObject · 8fd954b6
  Nicolas Fella authored Apr 22, 2019
```
This avoid detaching the QJsonObject
```
  8fd954b6
23 Mar, 2019 2 commits
- More https · 0c5a8e5a
  Nicolas Fella authored Mar 23, 2019
  
  0c5a8e5a
- Replace http GNU urls with https · 3b8fedea
  Nicolas Fella authored Mar 23, 2019
  
  3b8fedea
03 Feb, 2019 1 commit
- Add license header · 2f6f4d9d
  Nicolas Fella authored Feb 03, 2019
  
  2f6f4d9d
31 Jan, 2019 1 commit

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

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

41e13c2e

25 Jan, 2019 1 commit

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

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

864c83ff

09 Jan, 2019 1 commit

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

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

0b1fbde1

04 Dec, 2018 1 commit

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

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

686af65e

03 Dec, 2018 1 commit

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

Script Kiddy authored Dec 03, 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"

590afee8

26 Nov, 2018 1 commit

Fix container detach warnings from clazy · bd17dc20

Nicolas Fella authored Nov 25, 2018

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: apol, kdeconnect

Tags: #kde_connect

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

bd17dc20

23 Nov, 2018 1 commit

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

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

5843a02e

20 Nov, 2018 1 commit

Added Windows support to systemvolume plugin · 929fd062

Jun Bo Bi authored Nov 20, 2018 and

Albert Vaca Cintora committed Nov 20, 2018

Summary: I've added Windows support to the systemvolume plugin.

Test Plan: Move the volume sliders in the Android app

Reviewers: kdeconnect, #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, kdeconnect

Tags: #kde_connect, #windows

Maniphest Tasks: T10000

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

929fd062

01 Nov, 2018 1 commit

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

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

0faa5c5f

24 Oct, 2018 1 commit

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

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

6879cf14

23 Oct, 2018 1 commit

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

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

a98533b8

10 Oct, 2018 1 commit

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

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"

283211b4

22 Sep, 2018 1 commit

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

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

14994132

03 Sep, 2018 1 commit

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

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

5fb5af16

22 Aug, 2018 1 commit

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

Script Kiddy authored Aug 22, 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"

1ccf1a88

18 Aug, 2018 1 commit

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

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

932b7e28

04 Aug, 2018 1 commit

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

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

36aecee4

01 Aug, 2018 1 commit

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

Script Kiddy authored Aug 01, 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"

316387ad

31 Jul, 2018 1 commit

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

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

8c7f2c98

30 Jul, 2018 1 commit

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

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

2a242d42

29 Jul, 2018 1 commit

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

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

32233975

27 Jul, 2018 1 commit

Add systemvolume plugin · 02e52b78

Nicolas Fella authored Jul 27, 2018

Summary: This plugin allows controlling the system value from a remote device.

Test Plan: Apply Android patch, open up MPRIS Activity and play with the slider

Reviewers: #kde_connect, mtijink, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: kdeconnect, apol, zhigalin, albertvaka, davidedmundson, mtijink, #kde_connect

Tags: #kde_connect

Maniphest Tasks: T4659

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

02e52b78