Commits · 595e8d9a3542128bc38c520c1d5c4bf71e29ce44 · Network / KDE Connect

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

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 1 commit

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

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 2 commits
- 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 3 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
- SVN_SILENT made messages (.desktop file) - always resolve ours · 633b08d8
  Script Kiddy authored Mar 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"
```
  633b08d8
22 Mar, 2019 1 commit
- Remove mention to SMS from telephony plugin description · 3dd47013
  Albert Vaca Cintora authored Mar 22, 2019
  
  3dd47013
21 Mar, 2019 2 commits
- fix Ring for Windows port · b6f61e09
  Piyush Aggarwal authored Mar 21, 2019 and Albert Vaca Cintora committed Mar 21, 2019
  
  b6f61e09
- Remove unused return type · e5e74043
  Nicolas Fella authored Mar 21, 2019
  
  e5e74043
18 Mar, 2019 1 commit
- [sendnotis] Link agains KConfig again · 4550dcf4
  Nicolas Fella authored Mar 18, 2019
  
  4550dcf4
13 Mar, 2019 4 commits
- [plugins/sendnotification] Remove unneeded libs · 4ee0d0ba
  Nicolas Fella authored Mar 12, 2019
  
  4ee0d0ba
- [plugins/screensaverinhibit] Don't link against KNotifications · 08fbc8b5
  Nicolas Fella authored Mar 12, 2019
  
  08fbc8b5
- [plugins/remotekeyboard] Don't link against KI18n · c48ff21f
  Nicolas Fella authored Mar 12, 2019
  
  c48ff21f
- SVN_SILENT made messages (.desktop file) - always resolve ours · b44a0671
  Script Kiddy authored Mar 13, 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"
```
  b44a0671
11 Mar, 2019 6 commits
- [plugins/remotecommands] Remove stray includes · 49900be8
  Nicolas Fella authored Mar 11, 2019
  
  49900be8
- [plugins/photo] Don't link against KI18n · 78b11179
  Nicolas Fella authored Mar 11, 2019
  
  78b11179
- [plugins/mprisremote] Don't link against KI18n · 47e39ef5
  Nicolas Fella authored Mar 11, 2019
  
  47e39ef5
- [plugins/findmyphone] Don't link against core twice · 931a0304
  Nicolas Fella authored Mar 11, 2019
  
  931a0304
- [plugins/contacts] Don't link against KI18n · f2db6351
  Nicolas Fella authored Mar 11, 2019
  
  f2db6351
- [plugins/battery] Don't link against QtGui · b7e52dfd
  Nicolas Fella authored Mar 11, 2019
  
  b7e52dfd