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
09 Jun, 2019 2 commits
- Add wrapper for macos dbus connection · 54310738
  Weixuan Xiao authored Jun 09, 2019
  
  54310738
- SVN_SILENT made messages (.desktop file) - always resolve ours · af57aca5
  Script Kiddy authored Jun 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"
```
  af57aca5
02 Jun, 2019 2 commits
- Use notification hints from new Plasma notification system · 96cd5592
  Nicolas Fella authored Jun 02, 2019
  
  96cd5592
- Use a compositejob for receiving files · 283d0140
  Nicolas Fella authored Jun 02, 2019
  
  283d0140
26 May, 2019 1 commit

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

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

7ad5f81f

19 May, 2019 2 commits
- Simplify code in setDateModified · 3ad3e3e7
  Nicolas Fella authored May 19, 2019
  
  3ad3e3e7
- Fix macos build · 58beafb2
  Weixuan Xiao authored May 19, 2019
  
  58beafb2
14 May, 2019 1 commit
- Don't try to use PulseAudioQt on Windows · a67a99a7
  Nicolas Fella authored May 14, 2019
  
  a67a99a7
13 May, 2019 2 commits
- [findthisdevice] Unmute muted sinks before ringing · ba30d97f
  Nicolas Fella authored May 13, 2019
  
  ba30d97f
- Fix stuff in ScreensaverPlugin · 38c743fc
  Nicolas Fella authored May 13, 2019
  
  38c743fc
11 May, 2019 1 commit
- set last modified time for files received in Android-> PC transfers · 98bd91bf
  Piyush Aggarwal authored May 11, 2019
  
  98bd91bf
09 May, 2019 2 commits
- [Contacts Plugin] Fix brace placement and mild cleanup · eb0e3fce
  Simon Redman authored May 08, 2019
  
  eb0e3fce
- Move contacts synchronization to connected method · 320c070c
  Simon Redman authored May 05, 2019
  
  320c070c
08 May, 2019 2 commits

Make PulseAudioQT mandatory · 1d9ea25c
Nicolas Fella authored May 09, 2019
```
The ci issue has been sorted out

This reverts commit d3b41924.
```
1d9ea25c

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

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

ee1a535c

06 May, 2019 1 commit

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

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

437ded0a

05 May, 2019 3 commits
- Use QMap::firstKey() · 0ff45fdf
  Nicolas Fella authored May 05, 2019
  
  0ff45fdf
- Fix global static warning · c1878d10
  Nicolas Fella authored May 05, 2019
  
  c1878d10
- Don't unregister plugins from DBus in contructor · 92a2da05
  Nicolas Fella authored May 05, 2019
  
  92a2da05
04 May, 2019 1 commit
- [plugins/contacts] Unify coding style · 137d504b
  Nicolas Fella authored May 04, 2019
  
  137d504b
01 May, 2019 6 commits
- Revert "Make PulseAudioQT mandatory" · d3b41924
  Nicolas Fella authored May 01, 2019
```
This breaks CI as PAQt is not yet available there

This reverts commit b48596d7.
```
  d3b41924
- Add sanity check to dbus-exposed requestConversation() · c18c7b27
  Nicolas Fella authored May 01, 2019
  
  c18c7b27
- Fixme from 2014 is probably not a fixme · 3eb2f67d
  Albert Vaca Cintora authored May 01, 2019
  
  3eb2f67d
- Fix deviceTest · ad5428b0
  Nicolas Fella authored May 01, 2019
  
  ad5428b0
- Make PulseAudioQT mandatory · b48596d7
  Nicolas Fella authored May 01, 2019
  
  b48596d7
- SVN_SILENT made messages (.desktop file) - always resolve ours · 58e2f142
  Script Kiddy authored May 01, 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"
```
  58e2f142
30 Apr, 2019 2 commits
- Add Macro for MinGW and fix GUID Macro Fix for Windows building · 595e8d9a
  Nicolas Fella authored Apr 30, 2019
  
  595e8d9a
- replace phonon with QtMultimedia · 5b73c081
  Piyush Aggarwal authored Apr 30, 2019 and Nicolas Fella committed Apr 30, 2019
  
  5b73c081
28 Apr, 2019 3 commits
- [pausemusic] Port to PulseAudioQt · 3f4f4759
  Nicolas Fella authored Apr 28, 2019
  
  3f4f4759
- [sftp] Fix error message wording · b04dcde7
  Nicolas Fella authored Apr 28, 2019
  
  b04dcde7
- Port to new connect syntax · 93ebcc99
  Nicolas Fella authored Apr 28, 2019
  
  93ebcc99
25 Apr, 2019 1 commit
- [sftp] Improve error reporting · 3fcb87e0
  Nicolas Fella authored Apr 25, 2019
  
  3fcb87e0
22 Apr, 2019 2 commits
- Use initializer for QJsonObject · 8fd954b6
  Nicolas Fella authored Apr 22, 2019
```
This avoid detaching the QJsonObject
```
  8fd954b6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2c49558f
  Script Kiddy authored Apr 22, 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"
```
  2c49558f
16 Apr, 2019 1 commit

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

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

c1be806f

14 Apr, 2019 3 commits
- Coding style · d6de0413
  Nicolas Fella authored Apr 14, 2019
  
  d6de0413
- Don't connect to action invoked signals multiple times · 331cedfa
  Nicolas Fella authored Apr 14, 2019
  
  331cedfa
- Don't show multiple windows when replying to a notification · 54df8980
  Nicolas Fella authored Apr 14, 2019
  
  54df8980
08 Apr, 2019 1 commit

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

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

7df58d0d