Commits · d4026861ab912588f65ce32d2a5ba2efbad4e8d9 · Network / KDE Connect

30 Apr, 2019 4 commits
- Clean up includes · d4026861
  Nicolas Fella authored Apr 30, 2019
  
  d4026861
- replace phonon with QtMultimedia · 5b73c081
  Piyush Aggarwal authored Apr 30, 2019 and Nicolas Fella committed Apr 30, 2019
  
  5b73c081
- Check empty string using .isEmpty() instead of == "" · 459a1992
  Simon Redman authored Apr 30, 2019
  
  459a1992
- SVN_SILENT made messages (.desktop file) - always resolve ours · c9d85107
  Script Kiddy authored Apr 30, 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"
```
  c9d85107
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
23 Apr, 2019 1 commit

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

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

20e8f41b

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
20 Apr, 2019 1 commit

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

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

4fb45476

19 Apr, 2019 1 commit

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

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

fe02874c

18 Apr, 2019 1 commit

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

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

da6da3f5

17 Apr, 2019 1 commit

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

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

5cbc921f

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

15 Apr, 2019 1 commit

Restore FileItemActionPlugin · c8b51fb3

Albert Vaca Cintora authored Apr 15, 2019

The alternative using puropose is less mature than this and some of us
were missing the good old dolphin plugin.

This reverts commit a19713fb.

# Conflicts:
#	CMakeLists.txt

c8b51fb3

14 Apr, 2019 5 commits
- Fix crash in daemon · b50b7942
  Nicolas Fella authored Apr 14, 2019
  
  b50b7942
- 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
- SVN_SILENT made messages (.desktop file) - always resolve ours · af97c5f1
  Script Kiddy authored Apr 14, 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"
```
  af97c5f1
12 Apr, 2019 1 commit
- Add zsh autocomplete file · 2c44f55f
  Matthijs Tijink authored Mar 30, 2019
  
  2c44f55f
11 Apr, 2019 1 commit

Handle sms: URLs too · 834f9c37

Volker Krause authored Apr 10, 2019

Handling those URLs works perfectly fine already, for transferring the
phone number and the body, we just need to register for it.

834f9c37

10 Apr, 2019 1 commit

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

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

0fa2bcd4

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

02 Apr, 2019 1 commit

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

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

9ec0d04f

31 Mar, 2019 2 commits
- Tweak Upload job finished notification · 147fb6f3
  Nicolas Fella authored Mar 31, 2019
  
  147fb6f3
- SVN_SILENT made messages (.desktop file) - always resolve ours · faf92975
  Script Kiddy authored Mar 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"
```
  faf92975
30 Mar, 2019 1 commit

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

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

e2d1284a

29 Mar, 2019 2 commits
- Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface · 362b0ba2
  Simon Redman authored Mar 21, 2019 and Nicolas Fella committed Mar 29, 2019
  
  362b0ba2
- SVN_SILENT made messages (.desktop file) - always resolve ours · dd8ee45b
  Script Kiddy authored Mar 29, 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"
```
  dd8ee45b
28 Mar, 2019 1 commit

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

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

45be89c5

27 Mar, 2019 1 commit

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

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

c6b04d60

26 Mar, 2019 1 commit
- add icons for pair, accept, reject · d0cb028a
  Rituka Patwal authored Mar 26, 2019 and Nicolas Fella committed Mar 26, 2019
  
  d0cb028a
25 Mar, 2019 1 commit

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

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

abce7a19

24 Mar, 2019 3 commits
- Revert "QtGui is not needed in interfaces" · 5e5275ff
  Nicolas Fella authored Mar 24, 2019
```
It breaks icons in several places

This reverts commit 2538a6a3.
```
  5e5275ff
- More https · afe78214
  Nicolas Fella authored Mar 24, 2019
  
  afe78214
- SVN_SILENT made messages (.desktop file) - always resolve ours · e1618b1a
  Script Kiddy authored Mar 24, 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"
```
  e1618b1a
23 Mar, 2019 1 commit
- More https · 0c5a8e5a
  Nicolas Fella authored Mar 23, 2019
  
  0c5a8e5a