757 commits

Author	SHA1	Message	Date
ChrisTerBeke	c40d76f9ee	Fix formatting according to Cura code style	2018-12-03 23:13:24 +01:00
ChrisTerBeke	5fdff17782	Add upload messages for UI feedback, needs some refactoring	2018-12-03 22:12:18 +01:00
ChrisTerBeke	08e1b4691b	Remove TODO	2018-12-03 20:19:16 +01:00
ChrisTerBeke	8d6f109092	Set priority to 2	2018-12-03 20:11:53 +01:00
ChrisTerBeke	0852d2ebef	add one more TODO	2018-12-03 17:42:39 +01:00
ChrisTerBeke	d91efc656a	Add some more todo's for UI messages	2018-12-03 17:38:31 +01:00
ChrisTerBeke	90ec3f6cf9	Add TODO for progress messages	2018-12-03 17:22:21 +01:00
ChrisTerBeke	5db6bd9a9b	Send content type to API when uploading print job	2018-12-03 17:09:04 +01:00
Daniel Schiavini	2b8c9c17bb	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-03 16:39:24 +01:00
Daniel Schiavini	186c2cf3f5	START-322: Python 3.5 compatibility	2018-12-03 16:35:51 +01:00
ChrisTerBeke	ddf958d39a	Fix typing in CloudOutputDevice	2018-12-03 16:23:44 +01:00
ChrisTerBeke	24b75d781e	Fix merge conflict	2018-12-03 15:58:25 +01:00
Daniel Schiavini	f8f6670cae	STAR-322: Letting models convert sub-models	2018-12-03 15:06:01 +01:00
Daniel Schiavini	fc26ccd6fa	STAR-332: Some improvements to get the job in connect	2018-12-03 14:41:36 +01:00
Daniel Schiavini	8066074a2f	STAR-332: Fixing warnings	2018-12-03 11:02:49 +01:00
Diego Prado Gesto	e73a91e746	Merge branch 'master' into ui_rework_4_0	2018-12-02 12:11:12 +01:00
Jaime van Kessel	36a86adc0f	Remove spammy log	2018-11-30 16:08:19 +01:00
Marijn Deé	8b42b84618	Made a start with uploading jobs to the printer	2018-11-30 16:07:20 +01:00
Marijn Deé	763291821f	Added models to process the data from the api results ... Added code to update the UI models	2018-11-29 17:03:11 +01:00
Marijn Deé	8a72ba3cfa	Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device	2018-11-29 10:00:57 +01:00
Lipu Fei	5df7cdde48	Merge remote-tracking branch 'origin/master' into ui_rework_4_0	2018-11-29 08:54:22 +01:00
Ian Paschal	14cee32cec	Improve monitor tab temporary scroll bar	2018-11-28 12:20:09 +01:00
Simon Edwards	8262c2dfd6	Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile ... CL-1150 restyle monitor printer tile	2018-11-28 11:31:11 +01:00
Ian Paschal	9029d10ed0	Remove debug statement ... Contributes to CL-1150	2018-11-28 10:47:34 +01:00
Ian Paschal	370fa0fd14	Remove old sidebar ... Contributes to CL-1150	2018-11-28 10:46:22 +01:00
Ian Paschal	d54a1cb41b	Handle null print job more elegantly ... Contributes to CL-1150	2018-11-28 10:46:12 +01:00
Ian Paschal	255a7fa1fb	Fix binding loop ... Contributes to CL-1150	2018-11-28 10:45:46 +01:00
ChrisTerBeke	26f107d176	Use cluster_id as dict key, remove unneeded white space	2018-11-27 17:03:19 +01:00
ChrisTerBeke	4e150fb4bf	Merge branch 'master' into cloud-output-device	2018-11-27 16:59:28 +01:00
Marijn Deé	fd4d1113b9	use right plural in variable name	2018-11-27 15:42:26 +01:00
Marijn Deé	172e003e1b	Removed the inital call to clusters	2018-11-27 14:53:23 +01:00
Marijn Deé	fb019ba987	In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters	2018-11-27 14:48:47 +01:00
Diego Prado Gesto	ea75a60dd8	Merge branch 'master' into ui_rework_4_0	2018-11-27 13:17:10 +01:00
Diego Prado Gesto	c56098d82c	Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin ... Tests for um3networkplugin	2018-11-27 12:59:44 +01:00
Ian Paschal	fd723e1084	Improve camera icon ... Contributes to CL-1150	2018-11-27 11:19:45 +01:00
Ian Paschal	a3f0630ee9	Rename printer images ... Contributes to CL-1150	2018-11-27 11:19:30 +01:00
Ian Paschal	475a94d10d	Add printer images ... Commit to CL-1150	2018-11-27 10:55:08 +01:00
Ian Paschal	8965695a59	Update MonitorPrintJobProgressBar.qml ... Contributes to CL-1150	2018-11-27 10:54:46 +01:00
Ian Paschal	616ec13457	Change context menu button size ... Contributes to CL-1150	2018-11-27 10:54:26 +01:00
Ian Paschal	7340b6dbc4	Update CameraButton.qml ... Contributes to CL-1150	2018-11-27 10:53:00 +01:00
Ian Paschal	0cd9c8e087	Add machine images ... Contributes to CL-1150	2018-11-27 10:52:49 +01:00
ChrisTerBeke	efd5f3799b	Also catch TypeError now that we have explicit arguments	2018-11-26 16:31:32 +01:00
ChrisTerBeke	6506596ece	Fix typing syntax	2018-11-26 16:19:01 +01:00
ChrisTerBeke	2d7588903c	Merge branch 'tests-for-um3networkplugin' into cloud-output-device	2018-11-26 15:55:34 +01:00
ChrisTerBeke	e4d8fb36ab	Add more typing as per request from @sedwards2009	2018-11-26 15:53:04 +01:00
ChrisTerBeke	da5683c876	add typing to models	2018-11-26 15:30:30 +01:00
ChrisTerBeke	aaf0f69820	Fix some more relative imports	2018-11-26 15:10:36 +01:00
ChrisTerBeke	42ccabc7b6	Fix relative imports for plugin	2018-11-26 15:09:56 +01:00
ChrisTerBeke	39f92ced90	Comment out test	2018-11-26 15:02:52 +01:00
ChrisTerBeke	269d596f5d	Fix typing for cluster list	2018-11-26 14:54:24 +01:00