Lipu Fei 4e5d08f320 Fix merge conflicts with master

2019-03-21 14:59:53 +01:00

..

Materials

Merge branch '4.0'

2019-03-18 11:24:23 +01:00

GeneralPage.qml

Remove usage of plugin model

2019-02-21 17:16:59 +01:00

MachinesPage.qml

Rename SectionName to DiscoverySource in GlobalStacksModel

2019-03-20 10:39:23 +01:00

ProfilesPage.qml

Don't say that creating a profile needs to provide a 'new' name

2019-01-23 17:35:33 +01:00

ProfileTab.qml

Added id's to printer button, installed plugins, material fields and profile tab for integration tests

2019-03-01 12:47:29 +01:00

ReadOnlySpinBox.qml

Fix Enter key handling on material management page

2018-03-16 11:05:38 +01:00

ReadOnlyTextArea.qml

Changing AGPLv3 to LGPLv3

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

ReadOnlyTextField.qml

Fix Enter key handling on material management page

2018-03-16 11:05:38 +01:00

SettingVisibilityPage.qml

Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0

2018-12-05 13:29:06 +01:00