Diffusion Plasma Network Management Applet 19782bb328e3

Merge remote-tracking branch 'upstream/master'
19782bb328e3
Actions

Authored by mkacej on Mar 1 2018, 2:23 PM.

Description

Merge remote-tracking branch 'upstream/master'

merging with upstream

Details

Committed

mkacej

Mar 1 2018, 2:23 PM

Parents

R116:d9bba89dfe62: small refactoring
R116:e1673f18e942: Adjust spacing between text and plotter line in Speed tab of nm applet

Branches

Unknown

Tags

Unknown

mkacej committed R116:19782bb328e3: Merge remote-tracking branch 'upstream/master' (authored by mkacej).Mar 1 2018, 2:23 PM

Merged Changes

Commit		Author	Details	Committed
e1673f18e942	D10183	kamathraghavendra/nicolasfella	Adjust spacing between text and plotter line in Speed tab of nm applet	Feb 1 2018
e64b758c5ed7		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 28 2018
b76b32d2736e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 22 2018
8e7d8c896c93		jriddell	Update version number for 5.12.80 GIT_SILENT	Jan 15 2018
8e9efe407ef2		jriddell	Update version number for 5.11.95 GIT_SILENT	Jan 15 2018
2bf484392131		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 12 2018
cfe45d03e07f	D9765	broulik	Increase timeout for notification disconnected/connected notification	Jan 10 2018
85519d3da470		mlaurent	Remove obsolete reviewboardrc file	Jan 5 2018
f599ebd911bc		jgrulich	Add again support for 802-1x EAP PWD	Jan 4 2018
9e345849b94d		jgrulich	Show VPN connections even with a limited connection	Jan 3 2018
848d4d659048		jgrulich	README update++	Jan 2 2018
7651ebc02be0		jgrulich	We can use keywords	Jan 2 2018
0d14a546db3b		jgrulich	We don't need anymore to export plasma-nm version	Jan 2 2018
0e5fab77d1f2		jgrulich	Minor README refresh	Jan 2 2018
fa439a4a7a32		jgrulich	Revert "802-1x: Add support for EAP-PWD"	Jan 2 2018
f4a1918b825a		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 22 2017
02684b9041d7	D9422	broulik	[Connection Item] Use QtQuick's built-in HSV color features for cycling…	Dec 21 2017
cda12a4568de		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 18 2017
b98333458ca1		jgrulich	802-1x: Add support for EAP-PWD	Dec 13 2017
f623b2b30450		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 13 2017
a1464748af3b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 12 2017
8ab4c3c5825c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 7 2017
cbf4c261b5ec		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 5 2017

Changes (22)

				Path	Packages
	D			.reviewboardrc
	M			CMakeLists.txt
	M			README
	M			applet/contents/ui/ConnectionItem.qml
	M			applet/contents/ui/TrafficMonitor.qml
	D			config.h.cmake
	M			kded/bluetoothmonitor.cpp
	M			kded/modemmonitor.h
	M			kded/monitor.h
	M			kded/networkmanagement.notifyrc
	M			kded/notification.cpp
	M			kded/pindialog.h
	M			libs/declarative/connectionicon.h
	M			libs/editor/settings/security802-1x.cpp
	M			libs/editor/settings/ui/802-1x.ui
	M			libs/handler.h
	M			libs/models/networkmodel.h
	M			libs/models/networkmodelitem.cpp
	M			libs/uiutils.h
	M			vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop
	M			vpn/openconnect/plasmanetworkmanagement_openconnect_juniperui.desktop
	M			vpn/sstp/plasmanetworkmanagement_sstpui.desktop