tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2426 commits 81 branches 117 tags 12 MiB
Commit graph

835 commits

Author SHA1 Message Date
l10n daemon script
7ad5f81f52 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-05-26 05:12:50 +02:00
Nicolas Fella
3ad3e3e788 Simplify code in setDateModified 2019-05-19 17:13:07 +00:00
Weixuan Xiao
58beafb242 Fix macos build 2019-05-19 09:41:56 +00:00
Nicolas Fella
a67a99a7d6 Don't try to use PulseAudioQt on Windows 2019-05-14 22:16:41 +02:00
Nicolas Fella
ba30d97f92 [findthisdevice] Unmute muted sinks before ringing 2019-05-13 22:36:29 +00:00
Nicolas Fella
38c743fcd8 Fix stuff in ScreensaverPlugin 2019-05-13 22:35:44 +00:00
Piyush Aggarwal
98bd91bf1c set last modified time for files received in Android-> PC transfers 2019-05-11 19:52:00 +00:00
Simon Redman
eb0e3fce03 [Contacts Plugin] Fix brace placement and mild cleanup 2019-05-08 18:10:02 -06:00
Simon Redman
320c070c99 Move contacts synchronization to connected method 2019-05-08 18:02:32 -06:00
Nicolas Fella
1d9ea25c2f Make PulseAudioQT mandatory 
The ci issue has been sorted out

This reverts commit d3b41924b5.
 2019-05-09 01:05:23 +02:00
l10n daemon script
ee1a535cc2 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-05-08 05:42:59 +02:00
l10n daemon script
437ded0aa6 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-05-06 05:50:17 +02:00
Nicolas Fella
0ff45fdf49 Use QMap::firstKey() 2019-05-05 16:03:02 +02:00
Nicolas Fella
c1878d106a Fix global static warning 2019-05-05 15:58:50 +02:00
Nicolas Fella
92a2da05e6 Don't unregister plugins from DBus in contructor 2019-05-05 12:57:28 +00:00
Nicolas Fella
137d504b58 [plugins/contacts] Unify coding style 2019-05-04 16:15:49 +02:00
Nicolas Fella
d3b41924b5 Revert "Make PulseAudioQT mandatory" 
This breaks CI as PAQt is not yet available there

This reverts commit b48596d7c3.
 2019-05-01 14:53:30 +02:00
Nicolas Fella
c18c7b27f1 Add sanity check to dbus-exposed requestConversation() 2019-05-01 12:47:33 +00:00
Albert Vaca Cintora
3eb2f67d38 Fixme from 2014 is probably not a fixme 2019-05-01 14:46:25 +02:00
Nicolas Fella
ad5428b054 Fix deviceTest 2019-05-01 12:46:02 +00:00
Nicolas Fella
b48596d7c3 Make PulseAudioQT mandatory 2019-05-01 14:41:50 +02:00
l10n daemon script
58e2f142e0 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-05-01 05:56:02 +02:00
Nicolas Fella
595e8d9a35 Add Macro for MinGW and fix GUID Macro Fix for Windows building 2019-05-01 00:21:19 +02:00
Piyush Aggarwal
5b73c081da replace phonon with QtMultimedia 2019-04-30 16:24:09 +00:00
Nicolas Fella
3f4f475991 [pausemusic] Port to PulseAudioQt 2019-04-28 19:31:39 +00:00
Nicolas Fella
b04dcde70e [sftp] Fix error message wording 2019-04-28 19:28:06 +00:00
Nicolas Fella
93ebcc99a9 Port to new connect syntax 2019-04-28 16:35:44 +02:00
Nicolas Fella
3fcb87e0ed [sftp] Improve error reporting 2019-04-25 18:53:09 +00:00
Nicolas Fella
8fd954b6d8 Use initializer for QJsonObject 
This avoid detaching the QJsonObject
 2019-04-22 20:03:52 +02:00
l10n daemon script
2c49558f32 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-04-22 05:58:13 +02:00
l10n daemon script
c1be806f9d SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-04-16 05:57:25 +02:00
Nicolas Fella
d6de041324 Coding style 2019-04-14 19:23:29 +02:00
Nicolas Fella
331cedfa2f Don't connect to action invoked signals multiple times 2019-04-14 19:20:25 +02:00
Nicolas Fella
54df89809e Don't show multiple windows when replying to a notification 2019-04-14 17:05:01 +00:00
l10n daemon script
7df58d0d04 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-04-08 05:48:13 +02:00
l10n daemon script
9ec0d04f4d SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-04-02 06:03:00 +02:00
l10n daemon script
faf9297574 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-31 06:36:52 +02:00
l10n daemon script
e2d1284a93 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-30 05:58:33 +01:00
Simon Redman
362b0ba2e2 Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00
l10n daemon script
dd8ee45bac SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-29 05:57:07 +01:00
l10n daemon script
45be89c5ad SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-28 05:49:11 +01:00
l10n daemon script
c6b04d60a3 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-27 05:47:40 +01:00
l10n daemon script
abce7a194c SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-25 05:51:13 +01:00
Nicolas Fella
afe78214ac More https 2019-03-24 10:42:34 +01:00
l10n daemon script
e1618b1ad8 SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-24 05:23:24 +01:00
Nicolas Fella
0c5a8e5a1e More https 2019-03-23 17:38:09 +01:00
Nicolas Fella
3b8fedea1a Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
l10n daemon script
633b08d83e SVN_SILENT made messages (.desktop file) - always resolve ours 
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"
 2019-03-23 06:07:48 +01:00
Albert Vaca Cintora
3dd4701378 Remove mention to SMS from telephony plugin description 2019-03-22 08:52:16 +01:00
Piyush Aggarwal
b6f61e097f fix Ring for Windows port 2019-03-21 22:26:32 +00:00