Lipu Fei 94e89ad4ac Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

..

Materials

Fix favorite materials without material manager

2019-09-20 09:57:36 +02:00

GeneralPage.qml

Remove extraenous space

2019-09-23 11:43:24 +02:00

MachinesPage.qml

Remove a few more usages of deprecated functions

2019-05-16 15:20:38 +02:00

ProfilesPage.qml

Remove usage of Quality Manager

2019-09-10 14:55:32 +02: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 the updating of material diameter.

2019-07-02 15:16:41 +02: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

Remove a few more usages of deprecated functions

2019-05-16 15:20:38 +02:00