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

1149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Albert Vaca
03926cc3bf WIPx4 2015-12-02 11:04:35 -08:00
Albert Vaca
af5be6e9e0 Added a test mode to lanlinkprovider 
Should fix tests when you run them on networks with real kdeconnects
running.
 2015-12-02 09:49:00 -08:00
Albert Vaca
cf6cbd2925 WIPx3! 2015-12-01 10:45:14 -08:00
Albert Vaca
82bc73dd9b WIPx2 2015-12-01 07:25:34 -08:00
Albert Vaca
16f9af908a WIP 2015-11-30 10:36:01 -08:00
Albert Vaca
30d2dd991b Merge branch 'master' into sslmaster 2015-11-30 03:40:07 -08:00
l10n daemon script
949408119d 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"
 2015-11-30 10:26:50 +00:00
l10n daemon script
ddf57be9fa 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"
 2015-11-26 15:54:02 +00:00
Aleix Pol
2eadc8d97e Fix warnings 2015-11-26 16:19:00 +01:00
Elvis Angelaccio
c3b4b7190a Fix typo in fileitemaction plugin's name 
REVIEW: 126169
 2015-11-25 17:38:58 +01:00
Aleix Pol
0809e33118 Fix compilation with newer (and older, i.e. last relased) telepathy-qt versions 2015-11-23 12:39:25 +01:00
l10n daemon script
7558fdd93c 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"
 2015-11-22 09:53:09 +00:00
Michael Palimaka
af26fe245a Remove unused dependency. 
REVIEW: 126116
 2015-11-20 02:49:08 +11:00
l10n daemon script
ce766fb7ff 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"
 2015-11-19 12:12:59 +00:00
l10n daemon script
fc2bd97e69 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"
 2015-11-17 12:54:36 +00:00
l10n daemon script
5f66f7a7a6 SVN_SILENT made messages (after extraction) 2015-11-17 09:53:56 +00:00
l10n daemon script
f92534583d 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"
 2015-11-13 10:40:06 +00:00
Aleix Pol
b1692142b1 Polish NotificationsModel::isAnyDismissable proprety 
Let qml know it's computed on every call.
Consider it might have changed whenever a new notification enters as well.
 2015-11-12 12:27:30 +01:00
Albert Vaca
c729db4e47 Merge branch '0.9' 2015-11-11 17:12:24 -08:00
Albert Vaca
39da39edda Fixed broken link 2015-11-11 17:09:24 -08:00
Albert Vaca
c1ce7f523c Reordered lines 2015-11-11 11:03:00 -08:00
Albert Vaca
9afb4a587b Reduce the dbus timeout when dealing with mpris players 
We probably want to do this in way more places, since the default dbus
timeout is 25 seconds!
 2015-11-11 11:02:08 -08:00
Albert Vaca
cbc4cc5fd7 Improvise a name for a player if the mpris interface doesn't provide one 2015-11-11 11:00:59 -08:00
l10n daemon script
04d52fb022 SVN_SILENT made messages (.desktop file) 2015-11-11 13:05:11 +00:00
l10n daemon script
75bf18156a SVN_SILENT made messages (after extraction) 2015-11-11 11:45:55 +00:00
l10n daemon script
0145c837db 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"
 2015-11-11 10:30:30 +00:00
l10n daemon script
03987c86cd SVN_SILENT made messages (after extraction) 2015-11-11 07:49:47 +00:00
l10n daemon script
d9c8a7865e 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"
 2015-11-07 21:12:54 +00:00
l10n daemon script
99026c4e03 SVN_SILENT made messages (after extraction) 2015-11-07 15:38:52 +00:00
l10n daemon script
0b4d36546c SVN_SILENT made messages (.desktop file) 2015-11-04 19:54:08 +00:00
l10n daemon script
5d57029324 SVN_SILENT made messages (after extraction) 2015-11-04 18:30:25 +00:00
l10n daemon script
e424bcec1a 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"
 2015-11-04 17:00:05 +00:00
l10n daemon script
ebdd1f29c8 SVN_SILENT made messages (after extraction) 2015-11-04 14:12:48 +00:00
l10n daemon script
5b712ef7c9 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"
 2015-11-01 10:41:45 +00:00
l10n daemon script
49cc3294e6 SVN_SILENT made messages (.desktop file) 2015-10-28 12:40:23 +00:00
l10n daemon script
3fd1eb4d2f 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"
 2015-10-28 10:17:04 +00:00
l10n daemon script
7bbd93c024 SVN_SILENT made messages (.desktop file) 2015-10-27 14:38:42 +00:00
l10n daemon script
2bf2f2bac6 SVN_SILENT made messages (after extraction) 2015-10-27 13:29:38 +00:00
l10n daemon script
633952b638 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"
 2015-10-27 12:30:00 +00:00
l10n daemon script
0fa6cb17bc SVN_SILENT made messages (after extraction) 2015-10-27 09:49:38 +00:00
l10n daemon script
dda5ec5385 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"
 2015-10-26 03:37:32 +00:00
l10n daemon script
9067649a8f SVN_SILENT made messages (after extraction) 2015-10-26 01:46:19 +00:00
l10n daemon script
4239b0525b 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"
 2015-10-25 03:57:27 +00:00
Yuri Chornoivan
ff2940b07a Fix minor typo 2015-10-21 19:07:44 +03:00
Aleix Pol
2c53d8dcd4 Add some slightly more useful documentation 2015-10-21 03:00:17 +02:00
Aleix Pol
0bca50af93 Merge branch '0.9' 2015-10-19 17:48:13 +02:00
Albert Vaca
d2b4a6f214 Indentation 2015-10-18 21:51:51 -07:00
Albert Vaca
e2f068b286 Fixed a memory leak making the DownloadJob destroy itself on disconnect 
There are still some code paths where it doesn't get destroyed though,
like when the device gets unreachable (and the download socket doesn't
close for some reason).
 2015-10-18 21:51:51 -07:00
Albert Vaca
229e3aa070 Removed unused class 2015-10-18 19:42:40 -07:00
Aleix Pol
661fa098d4 Introduce bare documentation for the KDE Connect kcm 2015-10-19 03:25:17 +02:00