712 Commits

Author	SHA1	Message	Date
ChrisTerBeke	485b471522	Fix some review comments	2019-01-08 12:19:00 +01:00
ChrisTerBeke	7c7bca31c7	Fix renamed property connectionType	2019-01-08 11:52:27 +01:00
ChrisTerBeke	a6114d39e4	Fix merge conflicts with 4.0	2019-01-08 11:49:36 +01:00
Jaime van Kessel	4c1f68a447	Ensure that the connectiontype of a connected printer is set correctly ... CURA-6011	2019-01-04 15:24:01 +01:00
Jaime van Kessel	1973397b92	Remove confusing printer preference text ... CURA-6003	2019-01-03 15:34:41 +01:00
Jaime van Kessel	e769b324e1	Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0	2019-01-03 11:41:05 +01:00
Lipu Fei	ee72284616	Use appropriate log level ... CURA-6035	2019-01-03 08:32:42 +01:00
Jaime van Kessel	a16e406507	Properly display the full type + brand of unknown material ... CURA-6033	2018-12-31 11:01:30 +01:00
Marijn Dee	12a4a5e9f5	Fixing the rest of the automatic test failures	2018-12-21 15:06:02 +01:00
Marijn Dee	131211e604	Fixed the unit tests	2018-12-21 09:42:28 +01:00
ChrisTerBeke	5403f5241b	Fix not registering cloud output device for every machine	2018-12-20 17:21:07 +01:00
Marijn Dee	9d27c29c8c	Fixed indentation and relative import, tests still fail though	2018-12-20 17:04:17 +01:00
Marijn Dee	403010aa90	Mirrored the changes made to the models in Commons	2018-12-20 16:32:00 +01:00
ChrisTerBeke	af2061cd52	Simplify some checks for connection types and group size	2018-12-20 14:26:30 +01:00
Lipu Fei	e79f312fa0	Fix unit tests for SendMaterialJob ... CURA-6035	2018-12-20 14:20:34 +01:00
ChrisTerBeke	2f92f6ef50	Simplify checking if cloud or network printer, small fixes	2018-12-20 13:45:59 +01:00
Lipu Fei	68372aff60	Use MaterialManager in SendMaterialJob ... CURA-6035	2018-12-20 10:45:40 +01:00
Remco Burema	9dbc642967	SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035]	2018-12-19 17:34:31 +01:00
ChrisTerBeke	beb68213f4	Remove much logging or use debug level, fix cloud icon not appearing right away	2018-12-19 14:14:44 +01:00
ChrisTerBeke	cf06cb5351	Do not call printer_device.key before checking if it exists	2018-12-19 12:10:24 +01:00
ChrisTerBeke	d2746d03c1	Fix type checking for DiscoverUM3Action	2018-12-19 11:56:43 +01:00
ChrisTerBeke	5e9fe3fe50	Fix some codestyle, make connectionType a property as it's needed in QML	2018-12-19 11:21:50 +01:00
ChrisTerBeke	0588c54035	Start work on cloud icon	2018-12-18 16:29:13 +01:00
ChrisTerBeke	25caf1a087	Fix merge conflicts	2018-12-18 14:44:13 +01:00
Jaime van Kessel	84a7f2e5a2	Fix review comments ... CURA-6011	2018-12-18 09:40:08 +01:00
ChrisTerBeke	74bec96ce8	Fix a relative import	2018-12-17 17:41:02 +01:00
Daniel Schiavini	c5f438819a	STAR-322: Improving documentation	2018-12-17 15:11:01 +01:00
Daniel Schiavini	d28ac5e120	STAR-322: Improving documentation	2018-12-17 14:57:57 +01:00
Daniel Schiavini	da974d9868	STAR-322: Improving documentation	2018-12-17 14:51:57 +01:00
Daniel Schiavini	75d7d49349	STAR-322: Mocking the CuraApp	2018-12-17 14:41:28 +01:00
Daniel Schiavini	34f56b046a	STAR-322: Review comments	2018-12-17 13:13:44 +01:00
Daniel Schiavini	9eb743bcb8	STAR-322: Making mypy happy	2018-12-17 12:01:10 +01:00
Daniel Schiavini	9f4b7bd703	STAR-322: Improving logging and cluster connection	2018-12-17 11:28:16 +01:00
Jaime van Kessel	b8a4d8e80d	Remove the cluster connection type ... CURA-6011	2018-12-14 17:14:56 +01:00
Jaime van Kessel	226d052468	Move the machines from machinelist into their own model ... CURA-6011	2018-12-14 17:10:58 +01:00
Daniel Schiavini	3194a6d0bb	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload	2018-12-14 16:17:36 +01:00
Daniel Schiavini	e815d5da8f	STAR-322: Avoiding lambdas and direct callbacks to avoid gc	2018-12-14 16:02:28 +01:00
Daniel Schiavini	2f08854097	STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished	2018-12-14 14:50:15 +01:00
Daniel Schiavini	4dc8edb996	STAR-322: Fixing the multipart upload	2018-12-14 12:48:40 +01:00
Lipu Fei	aba3b6dd8e	Rename setKey() and add docs ... CURA-6011	2018-12-14 10:55:36 +01:00
Lipu Fei	6bf39a32a9	Rename Enum names to camal cases ... CURA-6011	2018-12-14 09:56:10 +01:00
Aleksei S	973970a895	Every print ouput device should define its connection type(usb, network, cluster and etc) ... CURA-6011	2018-12-13 16:00:12 +01:00
ChrisTerBeke	819f8531a2	Use CuraConstants for Cloud printing API root	2018-12-13 11:54:10 +01:00
Daniel Schiavini	fed779d0d2	STAR-322: Implementing multi-part upload (doesnt always work)	2018-12-12 17:31:08 +01:00
Daniel Schiavini	0467756ed6	STAR-322: Adding return type to init method	2018-12-11 16:01:52 +01:00
Daniel Schiavini	f04db63594	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-11 14:28:07 +01:00
Daniel Schiavini	a5d8e6ceb8	STAR-322: Removing the print job after it was done	2018-12-11 14:28:00 +01:00
ChrisTerBeke	7b7c687db7	Remove dismissable = False from messages as it's the default	2018-12-11 12:46:05 +01:00
ChrisTerBeke	e52339a424	Fix typing for output_device param in cloud output controller	2018-12-11 12:44:37 +01:00
Daniel Schiavini	073e8cd6dc	Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-11 12:39:02 +01:00