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

160 commits

Author SHA1 Message Date
l10n daemon script
a3082de593 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"
 2021-07-28 01:18:37 +00:00
Alexander Lohnau
30d895d868
Clean up unneeded JSON parameter in kcoreaddons_add_plugin 
The moc process already rebuilds the plugin when the JSON file changes, consequently the additional parameter is not needed.

Task: https://phabricator.kde.org/T14649
 2021-06-28 20:33:52 +02:00
l10n daemon script
46a19ac6cf 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"
 2021-04-19 01:18:23 +00:00
Piyush Aggarwal
80178b8ff8 clipboard: make new Wayland implementation build on non-Apple unices only 2021-04-07 17:00:50 +05:30
Aleix Pol
389a47b088 Add support for clipboard integration 
Copies over David's implementation in Klipper and integrates it in the
plugin. To do so it splits the ClipboardListener class into 2
subclasses: one that uses QClipboard and the other that uses the
DataControl classes.

BUG: 359747
 2021-04-07 00:43:51 +00:00
l10n daemon script
cd1d047a3c 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"
 2021-02-15 07:07:57 +01:00
l10n daemon script
e57fd79f26 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"
 2020-09-19 06:10:24 +02:00
l10n daemon script
b7bdc75ff9 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"
 2020-09-17 06:15:05 +02:00
Nicolas Fella
87db95b22f Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
l10n daemon script
e44e4a4c19 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"
 2020-06-20 05:10:40 +02:00
l10n daemon script
653a708727 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"
 2020-06-18 05:39:20 +02:00
l10n daemon script
e873eddcde 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"
 2020-06-17 14:06:59 +02:00
Antonio Larrosa
1d36164230 Use ecm_qt_declare_logging_category to declare the logging categories 
This automatizes the generation of logging categories so a
kdeconnect-kde.categories is generated and installed to
/usr/share/qlogging-categories5/ so kdebugsettings can use it.

Also, sets the default logging level to Warning. So now the logs
of users won't be filled with debug messages but they can
modify the configuration easily with kdebugsettings.
 2020-05-26 18:55:47 +02:00
l10n daemon script
0e04769a43 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"
 2020-04-07 06:11:40 +02:00
l10n daemon script
2d2cf7444a 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-08-07 05:00:07 +02:00
l10n daemon script
5427754e21 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-08-01 04:51:32 +02:00
l10n daemon script
76424c157b 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-07-24 05:30:15 +02:00
Colin Redman
7799973371 Clipboard sync on new connection 
Summary: Added a timestamp to track clipboard changes, so when a new device connects it will sync the most recently updated clipboard to both devices.

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: albertvaka, sredman, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D22584
 2019-07-23 16:22:02 +02:00
Weixuan Xiao
c5408adde3 macOS clipboard plugin 2019-07-18 11:54:41 +00:00
l10n daemon script
6d56f6a908 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-07-10 05:22:58 +02:00
l10n daemon script
cedd6f0c8b 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-06-29 05:17:17 +02:00
l10n daemon script
b7a435a5d0 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-06-24 05:03:34 +02:00
Nicolas Fella
5c16bfda5d Use K_PLUGIN_CLASS_WITH_JSON 2019-06-12 22:16:54 +02:00
Nicolas Fella
e601755644 Force usage of QStringLiteral and port remaining offenders 2019-06-10 14:40:28 +00: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
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
71c5a1b248 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-01-06 05:29:27 +01:00
l10n daemon script
6879cf14cd 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"
 2018-10-24 05:55:51 +02:00
l10n daemon script
e40312bf5e 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"
 2018-06-18 05:27:46 +02:00
Friedrich W. H. Kossebau
1f0d6b2a62 Remove unused "Encoding": "UTF-8" from plugins' metadata JSON 
Summary:
Had slipped in from conversion of metadata in desktop file format,
but are of no use in the JSON variant.

Test Plan: Plugins load and work as before

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Differential Revision: https://phabricator.kde.org/D11417
 2018-03-17 23:32:27 +01:00
Albert Vaca
f47f517827 Rename NetworkPackage -> NetworkPacket 
Summary: KDE Connect, now with correct naming!

Test Plan: It still builds.

Reviewers: #kde_connect, apol, nicolasfella

Reviewed By: #kde_connect, apol, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D11036
 2018-03-05 20:03:23 +01:00
l10n daemon script
057a114629 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"
 2017-09-19 04:58:52 +02:00
Albert Vaca
84bba9429f Merge branch 'master' into 1.x 
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
 2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48 Make member variable names, & placement and * placement more coherent 
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.

Basically:
 - mFoo -> m_foo
 - foo -> m_foo (if it is a member variable)
 - Type &ref -> Type& ref
 - Type *ptr -> Type* ptr

Reviewers: #kde_connect, nicolasfella, albertvaka

Reviewed By: #kde_connect, nicolasfella, albertvaka

Subscribers: albertvaka, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D7312
 2017-09-03 21:45:08 +02:00
l10n daemon script
dadcc76841 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"
 2017-08-06 06:02:06 +02:00
l10n daemon script
0356908fc8 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"
 2017-08-06 04:42:32 +02:00
l10n daemon script
66e77997d6 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"
 2017-07-25 06:09:45 +02:00
Albert Vaca
ef0e80c91f Merge branch 'master' into 1.x 
# Conflicts:
#	indicator/org.kde.kdeconnect.nonplasma.desktop
#	org.kde.kdeconnect.kcm.appdata.xml
#	plugins/runcommand/kdeconnect_runcommand.json
#	urlhandler/org.kde.kdeconnect.telhandler.desktop
 2017-07-24 16:49:06 +02:00
l10n daemon script
aa30780329 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"
 2017-07-19 08:33:01 +02:00
l10n daemon script
cc43a72884 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"
 2017-07-14 05:43:50 +02:00
l10n daemon script
72162bf8c9 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"
 2017-06-08 04:52:02 +02:00
l10n daemon script
0d217c58e1 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"
 2017-05-27 04:22:53 +02:00
l10n daemon script
be1d43b42d 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"
 2017-04-09 03:59:36 +02:00
Aleix Pol
3734d6ce4d Reduce API exposed through dbus 
Summary:
Don't use QDBusConnection::ExportAllContents
No need to make connect and receivedPackage public slots (they're are the
parent's already)

Fixes T4975

Test Plan: Rough manual test

Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Maniphest Tasks: T4975

Differential Revision: https://phabricator.kde.org/D3871
 2017-01-10 18:15:01 +01:00
l10n daemon script
e6a7df25aa 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-12-20 12:45:03 +01:00
l10n daemon script
5279a64e05 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-12-02 04:30:30 +01:00
l10n daemon script
eabdfc892b 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-11-30 04:24:23 +01:00
Albert Vaca
6a2a0b1c76 Merge branch '1.x' 
# Conflicts:
#	plugins/mpriscontrol/mpriscontrolplugin.cpp
#	plugins/sendnotifications/kdeconnect_sendnotifications.json
 2016-11-26 16:40:24 +01:00
Albert Vaca
c4643bcceb Singleton constructor should be private. 2016-11-26 16:21:34 +01:00
Albert Vaca
60331ccbf1 Clazy says all this QStringLiteral and QLatin1String were missing/wrong 2016-11-26 16:21:29 +01:00
l10n daemon script
b4e008847a 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-11-25 04:58:17 +01:00
l10n daemon script
73c6e1a306 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-11-24 05:29:38 +01:00
l10n daemon script
f0eb32c350 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-10-19 09:02:51 +00:00
l10n daemon script
3be06839a8 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-10-11 13:08:45 +00:00
l10n daemon script
ec0ca3976d 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-09-29 12:27:06 +00:00
Albert Vaca
0dbaceafa3 Merge branch 'master' into 1.x 
# Conflicts:
#	plugins/battery/kdeconnect_battery.json
#	plugins/clipboard/kdeconnect_clipboard.json
#	plugins/findmyphone/kdeconnect_findmyphone.json
#	plugins/kdeconnect.notifyrc
#	plugins/lockdevice/kdeconnect_lockdevice.json
#	plugins/mousepad/kdeconnect_mousepad.json
#	plugins/mpriscontrol/kdeconnect_mpriscontrol.json
#	plugins/mprisremote/kdeconnect_mprisremote.json
#	plugins/notifications/kdeconnect_notifications.json
#	plugins/pausemusic/kdeconnect_pausemusic.json
#	plugins/ping/kdeconnect_ping.json
#	plugins/remotecommands/kdeconnect_remotecommands.json
#	plugins/remotecontrol/kdeconnect_remotecontrol.json
#	plugins/runcommand/kdeconnect_runcommand.json
#	plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
#	plugins/sendnotifications/kdeconnect_sendnotifications.json
#	plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
#	plugins/sftp/kdeconnect_sftp.json
#	plugins/share/kdeconnect_share.json
#	plugins/telephony/kdeconnect_telephony.json
 2016-09-29 10:53:29 +02:00
l10n daemon script
167fd6cf59 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-09-28 11:51:45 +00:00
l10n daemon script
e884c4a9ac 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-09-18 09:32:51 +00:00
l10n daemon script
2d56c59386 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-09-14 09:17:50 +00:00
Albert Vaca
c19f26a95d Fixed clipboard propagation loop bug 
BUG: 362596
 2016-09-09 16:18:56 +02:00
Albert Vaca
36ed8080a9 Do not send back the clipboard to the same device which send it to us 2016-09-09 15:37:17 +02:00
Aleix Pol
f9406e8afc Introduce QVariantMap as an argument of NetworkPackage 
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.

Also port whenever possible to the initializer-list syntax.

REVIEW: 128269
 2016-06-21 20:07:12 +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
l10n daemon script
a9670e5a81 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-12 09:32:36 +00:00
l10n daemon script
45d5068143 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-01-05 13:22:15 +00:00
Albert Vaca
517c02451b Merge branch '0.9' 
# Conflicts:
#	kdeconnect.appdata.xml
#	plugins/mprisremote/kdeconnect_mprisremote.json
#	plugins/ping/kdeconnect_ping.json
#	plugins/remotecontrol/kdeconnect_remotecontrol.json
 2016-01-02 12:51:30 -08:00
l10n daemon script
a0c1a57999 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-12-30 09:23:05 +00:00
l10n daemon script
6434909e79 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-12-29 11:22:52 +00:00
l10n daemon script
1473868bc8 SVN_SILENT made messages (.desktop file) 2015-11-17 15:24:49 +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
eed4eb66fd SVN_SILENT made messages (.desktop file) 2015-11-13 13:01:51 +00:00
l10n daemon script
04d52fb022 SVN_SILENT made messages (.desktop file) 2015-11-11 13:05:11 +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
0b4d36546c SVN_SILENT made messages (.desktop file) 2015-11-04 19:54:08 +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
7bbd93c024 SVN_SILENT made messages (.desktop file) 2015-10-27 14:38:42 +00:00
l10n daemon script
47ee991548 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-01 10:36:43 +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
a794d51c4e 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-07-21 15:07:44 +00:00
l10n daemon script
69d8a40aa6 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-06-24 10:38:32 +00:00
l10n daemon script
4ed16c9f49 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-06-17 10:08:57 +00:00
l10n daemon script
326fecad6f 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-02 11:45:00 +00:00
Albert Vaca
6072b6cdbe Changed some plugin icons 2015-05-01 23:07:15 -07:00
Albert Vaca
0eeb58356c Fixed clipboard re-setting infinitely when devices form a connection loop. 
Not tested.

BUG: 346173
 2015-04-19 12:32:26 -07:00
Aleix Pol
509ab4ce02 Remove unneeded dependency link 2015-04-10 18:03:49 +02:00
l10n daemon script
aa91c6bbd6 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-10 10:24:31 +00: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
8e729f3ab2 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-04 11:03:11 +00:00
l10n daemon script
ff9d6b336b 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-03 10:36:58 +00:00
l10n daemon script
cda092d2bb 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-31 13:16:15 +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
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
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
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