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

20 commits

Author SHA1 Message Date
l10n daemon script
92cd693566 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-03-29 09:58:52 +00:00
l10n daemon script
98bb1ee564 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-03-27 09:50:58 +00:00
l10n daemon script
2cb090d2c9 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-03-26 10:12:56 +00:00
l10n daemon script
08eaaf11e1 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-03-25 09:09:47 +00:00
Aleix Pol
8f777040f7 Remove KNotifications dependency from libkdeconnectcore 
Moves the implementation into the actual daemon. This opens the
possibility for different ways to expose these notifications depending on
where the libkdeconnect will be deployed.

REVIEW: 123076
 2015-03-24 12:26:37 +01:00
Aleix Pol
c7cee37330 Port away from KServiceTrader 
Uses KPluginLoader+KPluginMetadata instead.
Describes plugins in json instead of desktop files. These desktop files are
then embedded into the .so file. All the plugins will be in a kdeconnect/
directory, and those will be the ones to look for.

Note it doesn't drop the KService dependency as KIOCore is a KDE Connect
dependency as well.

REVIEW: 123042
 2015-03-19 16:36:53 +01:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
ffe8a0c2d6 SVN_SILENT made messages (.desktop file) 2015-02-25 04:21:00 +00:00
Albert Vaca
dcfec8c593 Merge branch 'master' into frameworks 2015-02-03 19:05:12 -08:00
l10n daemon script
93ceecf1bd SVN_SILENT made messages (.desktop file) 2015-02-01 04:01:24 +00:00
Albert Vaca
6cc6d287fc Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/filetransferjob.cpp
	core/filetransferjob.h
	interfaces/notificationsmodel.cpp
	plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
	plugins/sftp/sftpplugin.cpp
 2015-01-20 22:44:31 -08:00
l10n daemon script
381c5a3181 SVN_SILENT made messages (.desktop file) 2015-01-13 04:48:51 +00:00
Albert Vaca
c7c1974ea9 Merge branch 'master' into frameworks 
Conflicts:
	core/backends/lan/lanlinkprovider.cpp
	plugins/ping/pingplugin.h
	plugins/telephony/telephonyplugin.cpp
 2015-01-10 20:14:01 -08:00
l10n daemon script
d4382eec31 SVN_SILENT made messages (.desktop file) 2015-01-09 04:19:56 +00:00
l10n daemon script
81a2855f30 SVN_SILENT made messages (.desktop file) 2015-01-04 04:08:04 +00:00
l10n daemon script
a2b04c3f25 SVN_SILENT made messages (.desktop file) 2015-01-03 03:53:09 +00:00
l10n daemon script
73e3a1d683 SVN_SILENT made messages (.desktop file) 2015-01-02 04:06:52 +00:00
l10n daemon script
5e3b981de2 SVN_SILENT made messages (.desktop file) 2015-01-01 04:02:02 +00:00
l10n daemon script
5baab6c7a9 SVN_SILENT made messages (.desktop file) 2014-12-31 04:00:47 +00:00
Pramod Dematagoda
0779377337 Added a plugin to inhibit the screensaver when a device is connected. 
The inhibition is lifted when the plugin disconnects.

REVIEW: 121692
 2014-12-29 23:31:25 -08:00