Commits · macos-sms-entry-fix · Weixuan Xiao / kdeconnect-kde

19 Aug, 2019 1 commit
- Merge branch 'master' into macos-sms-entry-fix · de7d2383
  Weixuan Xiao authored Aug 19, 2019
  
  de7d2383
18 Aug, 2019 2 commits
- re-add support for keyboard in Windows build · 5b13f289
  Piyush Aggarwal authored Aug 18, 2019
  
  5b13f289
- Fix indentation · 4cccacca
  Nicolas Fella authored Aug 18, 2019
  
  4cccacca
17 Aug, 2019 3 commits
- Fix presenter plugin for Win32 · 80608893
  Piyush Aggarwal authored Aug 17, 2019
  
  80608893
- use Qt in place of Unix-only symbols in kio/kdeconnect · d35b845c
  Piyush Aggarwal authored Aug 17, 2019
  
  d35b845c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 34cd3328
  Script Kiddy authored Aug 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"
```
  34cd3328
16 Aug, 2019 1 commit
- Allow to wrap label, so when we have a big url as when we send · 7b83bba4
  Laurent Montel authored Aug 16, 2019
```
sms we wrap text
```
  7b83bba4
15 Aug, 2019 1 commit
- Fix SMS icon in plasmoid · 6c403644
  Nicolas Fella authored Aug 15, 2019
  
  6c403644
14 Aug, 2019 3 commits
- Rename DbusHelper => DBusHelper · 0d7c504c
  Nicolas Fella authored Aug 14, 2019
  
  0d7c504c
- Fix printing DBus error · c6405813
  Nicolas Fella authored Aug 14, 2019
  
  c6405813
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6eb5e706
  Script Kiddy authored Aug 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"
```
  6eb5e706
12 Aug, 2019 1 commit

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

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

c5b76950

11 Aug, 2019 1 commit

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

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

392d287b

09 Aug, 2019 1 commit

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

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

b14009af

08 Aug, 2019 1 commit

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

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

7e139685

07 Aug, 2019 1 commit

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

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

2d2cf744

06 Aug, 2019 1 commit

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

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

688a7df0

04 Aug, 2019 1 commit

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

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

388d75bf

02 Aug, 2019 1 commit

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

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

28e33957

01 Aug, 2019 8 commits
- testsmshelper: Use QTEST_GUILESS_MAIN · 5d7983f5
  Heiko Becker authored Aug 01, 2019
```
The test still works fine with it, allowing it to run without a display
server.
```
  5d7983f5
- Split config issue fix for Win32 build · ccc8bb8a
  Piyush Aggarwal authored Aug 01, 2019
  
  ccc8bb8a
- list screenshots separately as per spec and make plasmoid one default · 256bfa7a
  Jonathan Esk-Riddell authored Aug 01, 2019
  
  256bfa7a
- Fix build · 4f213686
  Nicolas Fella authored Aug 01, 2019
  
  4f213686
- Make PulseAudioQt optional · 24777524
  Nicolas Fella authored Aug 01, 2019
```
Hopefully keeps those Pulseaudio deniers out pf my inbox
```
  24777524
- remove duplicate appstream file and just use this one for kde.org/applications · 7034cf5c
  Jonathan Esk-Riddell authored Aug 01, 2019
  
  7034cf5c
- switch to an addon appstream file and get rid of the .desktop file, this will... · a9078b37
  Jonathan Esk-Riddell authored Aug 01, 2019
```
switch to an addon appstream file and get rid of the .desktop file, this will shortly be supported by kde.org/applications
```
  a9078b37
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5427754e
  Script Kiddy authored Aug 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"
```
  5427754e
31 Jul, 2019 3 commits
- Add Q_UNUSED to squelch warning · f56a24d5
  Simon Redman authored Jul 31, 2019
  
  f56a24d5
- SVN_SILENT made messages (.desktop file) - always resolve ours · e4e4c58b
  Script Kiddy authored Jul 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"
```
  e4e4c58b
- GIT_SILENT made messages (after extraction) · 0c143f47
  Script Kiddy authored Jul 31, 2019
  
  0c143f47
30 Jul, 2019 4 commits
- Add description for presentation remote · f270a270
  Simon Redman authored Jul 30, 2019
  
  f270a270
- Remove Phabricator link from CONTRIBUTING.md · fcd473d3
  Simon Redman authored Jul 30, 2019
  
  fcd473d3
- Improve code style in macOS system volume plugin · 2be37aca
  Weixuan Xiao authored Jul 30, 2019
  
  2be37aca
- Optimization for executable path and resource path on macOS · 5fadeabc
  Weixuan Xiao authored Jul 30, 2019
  
  5fadeabc
29 Jul, 2019 4 commits

Remove reference to non-existant cmake variable · 3c783c45
Simon Redman authored Jul 29, 2019
```
SMSAPP_ENABLED no longer exists
```
3c783c45

Fix never-ending loading by adding a new signal indicating the SMS plugin has... · 2e04adf9

Simon Redman authored Jul 29, 2019

Fix never-ending loading by adding a new signal indicating the SMS plugin has received a reply (so is presumably done loading)

This may need to be reworked at some point for more advanced usecases (multiple apps listening to SMS, variable-length message requests, etc.) but it's fine for now

BUG 410095

2e04adf9

Add Commenting · 5b733486
Simon Redman authored Jul 29, 2019

5b733486

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

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

4f20075a

27 Jul, 2019 2 commits
- put win check within sfos · ccb9c1fd
  Piyush Aggarwal authored Jul 28, 2019
  
  ccb9c1fd
- Change to the unified solution · bd797d74
  Weixuan Xiao authored Jul 27, 2019
  
  bd797d74