Merge branch '1.x'
956d515fe920
Actions

Authored by apol on Sep 18 2017, 6:02 PM.

Description

Merge branch '1.x'

Details

Committed

apol	Sep 18 2017, 6:02 PM

Parents

R224:9336c0536016: Fix build with Bluetooth enabled
R224:749cf63244c9: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

apol committed R224:956d515fe920: Merge branch '1.x' (authored by apol).Sep 18 2017, 6:02 PM

Merged Changes

Commit		Author	Details	Committed
749cf63244c9		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Sep 4 2017
e41762faec5f		l10n daemon script	GIT_SILENT made messages (after extraction)	Sep 4 2017
84bba9429ff6		albertvaka	Merge branch 'master' into 1.x	Sep 3 2017
26d5bb8a6871		albertvaka	Updated README	Sep 2 2017
239f7f68304b		Albert Vaca	Expose isPluginEnabled and setPluginEnabled	Aug 22 2017
28f11bd5c9a7	D7224	apol	Fix receiving files with invalid URL characters	Aug 11 2017
815c2fe910e8		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 7 2017
dadcc76841a4		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 6 2017
ec97af93a6b9		apol	Use the same dialog for SendReply and SendSms	Aug 5 2017
824eac228eac		apol	Improvements on the SendReplyDialog	Aug 3 2017
9e0d4874c072	D7017	jeanv/Albert Vaca	Make sure MPRIS players have a unique name	Aug 2 2017
a18f91ccc1e5		albertvaka	Swapped labels	Aug 2 2017
299b1ee2bb88		apol	Remove cruft from send notifications ui file	Aug 2 2017
b83b969f908e		albertvaka	Remote command host can only be used from the qml app	Aug 2 2017
3c3b5b03917f	D6943	nicolasfella/albertvaka	Gave plasmoid some love	Aug 1 2017
364ab02aad66		apol	set total amount later	Aug 1 2017
d1d84bc464c5		aacid	Fix DownloadJob not finishing	Aug 1 2017
36c2e15fc7a0		albertvaka	Check if there was an error before emitting shareReceived.	Aug 1 2017
88e43ada1e34		albertvaka	Fix rounding	Aug 1 2017
2b17d89fc1cb		apol	Revert "No need to use a QBuffer in DownloadJob"	Aug 1 2017
d61d52ac1ffa		apol	Fix reported file transfer speed	Aug 1 2017
af778b71b166	D6039	aacid/apol	No need to use a QBuffer in DownloadJob	Aug 1 2017
08f31736ad70		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 26 2017
baf2f9411cd5		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 26 2017
7907f41cc008		albertvaka	Triggers a bug -> fixes a bug	Jul 25 2017
aec736fe562f		albertvaka	Fix file corruption bug on SFTP plugin	Jul 25 2017
66e77997d658		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 25 2017
ef0e80c91f54		albertvaka	Merge branch 'master' into 1.x	Jul 24 2017
3dd7144e21cc		albertvaka	qDebug -> qCInfo	Jul 24 2017
470fdfef8112		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 24 2017
2c9b1d9366a5		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 24 2017
9f313f94c2a5		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 23 2017
6d4bb21655ce		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 23 2017
631880083d7c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 19 2017
dbe288664c02		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 19 2017
e6f3b5bd2792		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 18 2017
6d4eecc3e130		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 18 2017
d8c578edc9f9		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 17 2017
028c8d86952d		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 17 2017
322fcd47a541		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 16 2017
be30441da520		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 16 2017
d513d9e37eb6		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 15 2017
e09da05dcc69		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 15 2017
cc43a728846d		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 14 2017
4d10aed04700		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 14 2017
d7ec24725f93		apol	Make sure we keep track of changes when the device link changes	Jul 14 2017

Changes (62)

				Path	Packages
	M			README.md
	M			app/org.kde.kdeconnect.app.desktop
	M			core/backends/lan/downloadjob.cpp
	M			core/backends/lan/downloadjob.h
	M			core/backends/lan/lanlinkprovider.cpp
	M			core/device.cpp
	M			core/device.h
	M			core/filetransferjob.cpp
	M			core/filetransferjob.h
	M			daemon/kdeconnect.desktop
	M			daemon/kdeconnectd.desktop.cmake
	M			fileitemactionplugin/kdeconnectsendfile.desktop
	M			indicator/org.kde.kdeconnect.nonplasma.desktop
	M			kcm/kcm.cpp
	M			kcm/kcm_kdeconnect.desktop
	M			kcm/org.kde.kdeconnect.kcm.desktop
	M			org.kde.kdeconnect.kcm.appdata.xml
	M			plasmoid/package/metadata.desktop
	M			plugins/CMakeLists.txt
	M			plugins/battery/kdeconnect_battery.json
	M			plugins/clipboard/kdeconnect_clipboard.json
	M			plugins/findmyphone/kdeconnect_findmyphone.json
	M			plugins/kdeconnect.notifyrc
	M			plugins/kdeconnect_plugin.desktop
	M			plugins/lockdevice/kdeconnect_lockdevice.json
	M			plugins/mousepad/kdeconnect_mousepad.json
	M			plugins/mousepad_windows/kdeconnect_mousepad.json
	M			plugins/mpriscontrol/kdeconnect_mpriscontrol.json
	M			plugins/mpriscontrol/mpriscontrolplugin.cpp
	M			plugins/mprisremote/kdeconnect_mprisremote.json
	M			plugins/notifications/CMakeLists.txt
	M			plugins/notifications/kdeconnect_notifications.json
	M			plugins/notifications/notificationsdbusinterface.cpp
	M			plugins/notifications/sendreplydialog.cpp
	M			plugins/notifications/sendreplydialog.h
	A			plugins/notifications/sendreplydialog.ui
	M			plugins/pausemusic/kdeconnect_pausemusic.json
	M			plugins/pausemusic/kdeconnect_pausemusic_config.desktop
	M			plugins/ping/kdeconnect_ping.json
	M			plugins/remotecommands/kdeconnect_remotecommands.json
	M			plugins/remotecontrol/kdeconnect_remotecontrol.json
	M			plugins/remotekeyboard/kdeconnect_remotekeyboard.json
	M			plugins/runcommand/kdeconnect_runcommand.json
	M			plugins/runcommand/kdeconnect_runcommand_config.desktop
	M			plugins/runcommand/runcommandplugin.cpp
	M			plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
	M			plugins/sendnotifications/kdeconnect_sendnotifications.json
	M			plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
	M			plugins/sendnotifications/sendnotifications_config.ui
	M			plugins/sftp/kdeconnect_sftp.json
	M			plugins/sftp/mounter.cpp
	M			plugins/share/kdeconnect_share.json
	M			plugins/share/kdeconnect_share_config.desktop
	M			plugins/share/shareplugin.cpp
	M			plugins/share/shareplugin.h
	M			plugins/telephony/CMakeLists.txt
	M			plugins/telephony/kdeconnect_telephony.json
	D			plugins/telephony/sendsmsdialog.cpp
	D			plugins/telephony/sendsmsdialog.h
	M			plugins/telephony/telephonyplugin.cpp
	M			tests/sendfiletest.cpp
	M			urlhandler/org.kde.kdeconnect.telhandler.desktop