Ghostkeeper 1d7792861d

Merge branch '3.0' ...

Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.

2017-10-02 17:40:24 +02:00

..

__init__.py

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

action-required-icon.svg

CL-470 Update the icon SVGs

2017-10-02 13:53:09 +02:00

blocked-icon.svg

CL-470 Update the icon SVGs

2017-10-02 13:53:09 +02:00

camera-icon.svg

CL-474 Fix the image used for the camera icon

2017-10-01 12:01:08 +02:00

checkmark-icon.svg

CL-470 Update the icon SVGs

2017-10-02 13:53:09 +02:00

ClusterControlItem.qml

CL-457 added margin to top in monitor screen

2017-10-02 11:55:54 +02:00

ClusterMonitorItem.qml

CL-457 removed trailing spaces

2017-10-02 15:04:45 +02:00

DiscoverUM3Action.py

Remove "Sync" button

2017-09-06 12:17:40 +02:00

DiscoverUM3Action.qml

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

MonitorItem.qml

Merge pull request #2200 from fieldOfView/fix_monitoritem_size

2017-08-15 15:04:18 +02:00

NetworkClusterPrinterOutputDevice.py

Merge pull request #2541 from Ultimaker/CL-228-authorization

2017-10-02 17:33:11 +02:00

NetworkPrinterOutputDevice.py

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

NetworkPrinterOutputDevicePlugin.py

Merge pull request #2517 from Ultimaker/CL-460-avahi-connect-detect

2017-10-02 11:33:18 +02:00

OpenPanelButton.qml

Merge branch '3.0'

2017-10-02 17:40:24 +02:00

plugin.json

Set author to Ultimaker B.V. instead of Ultimaker

2017-06-28 13:50:37 +02:00

PrintCoreConfiguration.qml

Add in all of the changes for Cura Connect

2017-09-27 10:29:48 +02:00

PrinterInfoBlock.qml

Solve merge conflicts

2017-10-02 16:13:32 +02:00

PrinterTile.qml

Apply screenScaleFactor to Cura Connect UI

2017-09-28 17:36:35 +02:00

PrinterVideoStream.qml

Apply screenScaleFactor to Cura Connect UI

2017-09-28 17:36:35 +02:00

PrintWindow.qml

Apply screenScaleFactor to Cura Connect UI

2017-09-28 17:36:35 +02:00

UM3InfoComponents.qml

CL-228 when adding a Cura Connect printer, do not ask authentication, it is always authenticated

2017-10-02 14:20:41 +02:00