Lipu Fei 7e176e0f2c Fix merge conflicts

2019-03-21 08:34:07 +01:00

..

AddLocalPrinterScrollView.qml

Use Item instead of transparent Rectangle

2019-03-20 13:49:14 +01:00

AddNetworkPrinterScrollView.qml

Simplify code

2019-03-20 14:07:13 +01:00

AddPrinterByIpContent.qml

No more hardcoded margins (and other QML fixes) in 'add-by-ip'. [CURA-6294]

2019-03-20 13:16:10 +01:00

AddPrinterBySelectionContent.qml

WIP: Add first-start machine actions

2019-03-19 14:24:57 +01:00

CloudContent.qml

WIP: Fixes and add cloud logic to cloud welcome page

2019-03-13 10:37:41 +01:00

DataCollectionsContent.qml

WIP: Fixes and add cloud page

2019-02-28 08:33:28 +01:00

DropDownHeader.qml

WIP: Complete add network and local printer flow

2019-03-13 10:31:47 +01:00

DropDownWidget.qml

WIP: Complete add network and local printer flow

2019-03-13 10:31:47 +01:00

FirstStartMachineActionsContent.qml

WIP: Cleanup MachineSettingsAction

2019-03-20 08:59:20 +01:00

StepPanel.qml

WIP: Cleanup and unify MachineAction styles

2019-03-19 15:40:44 +01:00

UserAgreementContent.qml

Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057]

2019-03-14 14:59:04 +01:00

WelcomeContent.qml

WIP: Fixes and add cloud page

2019-02-28 08:33:28 +01:00

WelcomeDialog.qml

WIP: dos2unix new files

2019-02-28 08:07:44 +01:00

WhatsNewContent.qml

WIP: Fixes and add cloud page

2019-02-28 08:33:28 +01:00