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

58 commits

Author SHA1 Message Date
l10n daemon script
60c3bf9b90 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"
 2016-06-22 16:33:04 +00:00
Albert Vaca
e880e14ed5 Preffer Q_FOREACH to foreach 2016-06-21 14:50:17 +02:00
Aleix Pol
596e4484f4 Clean up use of virtual and override keywords 
Only use virtual when actually virtual, to override just use override.
 2016-06-20 19:22:29 +02:00
Elvis Angelaccio
1290296e5c Don't leak QMenu in fileitemactionplugin 
REVIEW: 128091
 2016-06-03 20:30:29 +02:00
Aleix Pol
668c37446c Fix typo that prevented the dolphin integration to work 
BUG: 362684
 2016-05-06 02:07:31 +02:00
l10n daemon script
c2ff5c5101 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"
 2016-03-03 09:54:08 +00:00
l10n daemon script
f6724de704 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"
 2016-02-14 09:18:22 +00:00
l10n daemon script
5eb9a54bcc 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"
 2016-02-05 09:16:28 +00:00
Elvis Angelaccio
c3b4b7190a Fix typo in fileitemaction plugin's name 
REVIEW: 126169
 2015-11-25 17:38:58 +01: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
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
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
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
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
l10n daemon script
9f291d9ef7 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-02 10:15:24 +00:00
l10n daemon script
5795e27191 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-09-10 11:33:23 +00:00
Aleix Pol
d58f6314fe run Clang Modernize 
Minus the auto change
 2015-09-08 10:47:37 +02:00
l10n daemon script
397e6f69e3 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-05-26 13:51:37 +00:00
l10n daemon script
ab93807baf 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-05-25 10:12:32 +00:00
l10n daemon script
3efaae6f88 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-05-03 10:29:27 +00:00
Aleix Pol
3caf5e7908 Move some find_package dependencies to the children directories as agreed 2015-04-10 17:48:48 +02:00
l10n daemon script
8349588c77 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-04-06 09:54:12 +00:00
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
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
Albert Vaca
a5e5b10d9a Code styling 2015-03-21 23:12:04 -07:00
Albert Vaca
4477ff29d9 Fixed Dolphin's extension 
It was not working because it used the model (that is now async) instead
of dbus interfaces.

CCMAIL: aleixpol@kde.org
 2015-03-21 22:50:00 -07:00
Albert Vaca
d8a2aac952 Merge branch 'master' into frameworks 2015-03-01 21:33:47 -08:00
l10n daemon script
5f0811dff8 SVN_SILENT made messages (.desktop file) 2015-02-21 04:46:14 +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
73e3a1d683 SVN_SILENT made messages (.desktop file) 2015-01-02 04:06:52 +00:00
l10n daemon script
917104ff99 SVN_SILENT made messages (.desktop file) 2014-12-26 04:20:08 +00:00
l10n daemon script
365b2c55b2 SVN_SILENT made messages (.desktop file) 2014-12-25 04:06:46 +00:00
Aleix Pol
21ab5a4f81 Merge branch 'master' into frameworks 
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
 2014-11-04 19:12:29 +01:00
l10n daemon script
3b192ea18e SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
l10n daemon script
0b511a73cc SVN_SILENT made messages (.desktop file) 2014-10-05 04:22:42 +00:00
Àlex Fiestas
0c0cfb711d Port fileitemactionplugin free of KDELibs4Support 2014-09-23 19:33:03 +02:00
l10n daemon script
3ea4264652 SVN_SILENT made messages (.desktop file) 2014-09-23 04:52:04 +00:00
Àlex Fiestas
677f650216 Removed K_EXPORT_PLUGIN, no longer needed 
With kf5 this is not longer needed. removing it!
 2014-09-22 02:40:51 +02:00
Àlex Fiestas
02fd748f41 Interfaces no longer depend on kdelibs4support 
Also since fileitemactionplugin was using them (and inhering
kdelibs4support) not we have tu explicitly link against it in there.
 2014-09-22 00:16:39 +02:00
Àlex Fiestas
101c741266 Make sendfileitemaction ready for qCDebug 
We are not using debug statements in this pluging, but for when we do
debugging will be ready.
 2014-09-22 00:15:36 +02:00
Àlex Fiestas
53830bfa68 Use QUrl instead of KUrl in fileitemactionplugin 
Again, straight forward port, simple replace works.
 2014-09-21 22:22:47 +02:00
Àlex Fiestas
42269a9dda Port from KIcon to QIcon 
Executed kcm and some notifications, icons are still shown.
 2014-09-13 01:04:48 +02:00
l10n daemon script
afc3c33f99 SVN_SILENT made messages (.desktop file) 2014-09-11 04:17:22 +00:00
Lukáš Tinkl
743f7548e0 i18n fixes 2014-09-08 03:09:18 +02:00
Albert Vaca
a303b73238 Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	plasmoid/package/contents/ui/FullRepresentation.qml
	plugins/ping/pingplugin.cpp
 2014-07-01 23:59:38 +02:00
l10n daemon script
a48b066ab4 SVN_SILENT made messages (.desktop file) 2014-06-29 04:35:25 +00:00
Aleix Pol
59cab0dc06 When trying to send file, actually tell the plugin to send the file 
Works wonderfully on new apk's. \o/

Reviewed by Albert Vaca
 2014-06-27 16:46:49 +02:00
l10n daemon script
7cbd1c0d57 SVN_SILENT made messages (.desktop file) 2014-06-24 05:03:52 +00:00
Aleix Pol
16aaa9f77c Merge branch 'master' into frameworks 2014-06-21 02:06:50 +02:00
l10n daemon script
2da541f5f6 SVN_SILENT made messages (.desktop file) 2014-06-20 04:55:41 +00:00