Lipu Fei 4e5d08f320 Fix merge conflicts with master

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

..

PrinterOutput

Move ConfigurationModel into cura.UI module

2019-03-20 09:51:06 +01:00

Settings

Fix merge conflicts with master

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

UI

Fix DiscoveredMachineModel test

2019-03-20 16:00:39 +01:00

conftest.py

Move MachineActionManager into cura.UI module

2019-03-20 09:10:48 +01:00

TestArrange.py

Reduce print output during happy path of automated tests

2019-03-11 11:10:09 +01:00

TestGCodeListDecorator.py

Add test for gcodeListDecorator

2019-01-25 14:04:53 +01:00

TestMachineAction.py

Move MachineActionManager into cura.UI module

2019-03-20 09:10:48 +01:00

TestMachineManager.py

Fix DiscoveredMachineModel test

2019-03-20 16:00:39 +01:00

TestMaterialManager.py

Added extra tests for materialManager

2019-03-15 13:57:22 +01:00

TestOAuth2.py

Fix unit tests

2019-02-08 22:53:12 +01:00

TestPrintInformation.py

Fix merge conflicts with master

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

TestProfileRequirements.py

Fix failing unit test

2019-02-11 13:30:32 +01:00

TestQualityManager.py

Adds tests for QualityManager

2019-03-15 14:51:35 +01:00