5232 Commits

Author	SHA1	Message	Date
Daniel Schiavini	bfe04a55f9	Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-10 10:45:37 +01:00
Daniel Schiavini	75c2e25a01	STAR-322: Testing more of the device manager	2018-12-10 10:43:22 +01:00
Daniel Schiavini	c495ade2d3	STAR-322: Documenting the network manager mock	2018-12-10 09:42:26 +01:00
Daniel Schiavini	45f51c3588	STAR-322: First test cloud output device manager	2018-12-07 18:09:20 +01:00
Daniel Schiavini	e0b159e2ad	STAR-322: Creating a network manager mock	2018-12-07 17:46:35 +01:00
Daniel Schiavini	63c5b77959	STAR-322: Fixing finished jobs	2018-12-07 16:43:53 +01:00
Marijn Deé	74028c4fa1	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-07 16:21:38 +01:00
Marijn Deé	07801b5394	First test for CloudDevices	2018-12-07 16:21:08 +01:00
Daniel Schiavini	5b963de2ea	STAR-322: Checking if response changed before updating cluster	2018-12-07 13:19:45 +01:00
Diego Prado Gesto	46fa33fda5	Merge branch 'ui_rework_4_0' into place_print_info_back	2018-12-07 13:19:19 +01:00
Diego Prado Gesto	9c873faace	Merge branch 'ui_rework_4_0' into place_print_info_back	2018-12-07 13:11:15 +01:00
Daniel Schiavini	2b8358fda8	STAR-322: Improvements to date calculation and signalling	2018-12-07 12:39:37 +01:00
Diego Prado Gesto	1d33fe081f	Clean up the code ... Remove all the references to the sidebar and use the term print_setup instead. Contributes to CURA-5941.	2018-12-07 12:07:41 +01:00
Daniel Schiavini	4f82a2759a	STAR-322: Improving configuration models interface	2018-12-07 12:04:02 +01:00
Daniel Schiavini	a1c252d3a2	Revert "Revert "fix merge conflict"" ... This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.	2018-12-07 10:25:46 +01:00
Daniel Schiavini	4bffa6d90f	Revert "fix merge conflict" ... This reverts commit ec03b012a77a766e45a43a224bbb76cd32d0915a, reversing changes made to 2af33738d17f95c87dcb8c826b0940576e4359c3.	2018-12-07 10:22:32 +01:00
ChrisTerBeke	3ebefa4f8a	Add more TODO comments to clarify	2018-12-06 16:59:09 +01:00
ChrisTerBeke	ec03b012a7	fix merge conflict	2018-12-06 16:39:58 +01:00
Diego Prado Gesto	3b8b70bddf	Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-06 16:35:07 +01:00
Marijn Deé	2af33738d1	Don't look at the timer	2018-12-06 16:32:00 +01:00
Marijn Deé	373c953dbf	Showing print queue, works with multiple printers in cluster, Add TODO	2018-12-06 16:25:04 +01:00
alekseisasin	e29baf0cec	Merge pull request #4943 from Ultimaker/small_ui_fixes ... Small ui fixes	2018-12-06 15:23:35 +01:00
Diego Prado Gesto	3ca749cdcb	Add a bunch of renderTypes to labels in the DiscoverUM3Action.	2018-12-06 14:31:52 +01:00
Marijn Deé	05ca0b372a	Updated TODO, printjobs are not displayed in the monitor page because ... data returned from cura connect api contains None's instead of printer uuid's	2018-12-06 14:04:12 +01:00
Diego Prado Gesto	76acb13f59	Change the play/pause button colors	2018-12-06 13:50:58 +01:00
Marijn Deé	eb3777ed9f	Cleaner login and update cluster flow, start update cluster timer ... at startup when the user is already logged in	2018-12-06 10:40:06 +01:00
Diego Prado Gesto	b0c3a4e17a	Align the additional components to the right of the job specs ... The model checker now shows centered	2018-12-06 09:25:31 +01:00
ChrisTerBeke	94f31378a6	Add a TODO	2018-12-05 17:24:47 +01:00
ChrisTerBeke	ce07e31bbf	Implement active printer for cloud device to get monitor page functionality working	2018-12-05 17:21:46 +01:00
ChrisTerBeke	66690dfef7	Add testing todo	2018-12-05 17:06:22 +01:00
ChrisTerBeke	5e15858cae	more mocks for monitor page, fix showing current print job in monitor page, add todo	2018-12-05 17:05:21 +01:00
Daniel Schiavini	117cf10a2c	STAR-322: Removing devices when logging off	2018-12-05 16:26:20 +01:00
Daniel Schiavini	657e763318	STAR-322: Using findChanges method to simplify code	2018-12-05 16:15:51 +01:00
Daniel Schiavini	7e76913736	STAR-322: Fixing printer matching by network key	2018-12-05 16:02:38 +01:00
ChrisTerBeke	cd67100097	Comment out some currently broken code	2018-12-05 15:40:45 +01:00
Daniel Schiavini	9f4b047ee1	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-05 14:08:46 +01:00
Daniel Schiavini	b693b9d98f	STAR-322: Extracting models to be able for converting themselves	2018-12-05 14:08:40 +01:00
ChrisTerBeke	7d7dd6bdde	First idea for pairing local and remote clusters	2018-12-05 14:02:53 +01:00
Diego Prado Gesto	07d58c3aef	Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-05 13:56:21 +01:00
Ghostkeeper	024bf409c9	Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0	2018-12-05 13:29:06 +01:00
Diego Prado Gesto	909b0f3f7e	Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown	2018-12-05 13:10:42 +01:00
Diego Prado Gesto	537929893f	Merge branch 'master' into ui_rework_4_0	2018-12-05 13:10:14 +01:00
Ian Paschal	e8a933331c	Clean-up printer status label ... Contributes to CL-1153	2018-12-05 12:14:18 +01:00
Daniel Schiavini	163226f940	STAR-322: Using composition rather than inheritance	2018-12-05 12:02:04 +01:00
Daniel Schiavini	d99e2d1533	STAR-322: Extracting file handler methods	2018-12-05 11:21:17 +01:00
Daniel Schiavini	3c5e74a72c	Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection	2018-12-05 10:44:53 +01:00
Daniel Schiavini	01e443049f	STAR-322: Creating a subclass for connect devices	2018-12-05 10:37:58 +01:00
Diego Prado Gesto	cdb8020029	Add another expandable component ... Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component. Contributes to CURA-5941.	2018-12-05 09:39:04 +01:00
ChrisTerBeke	b57f6c5c6a	Do no stop when no clusters are found, we still might need to remove some	2018-12-04 22:58:50 +01:00
ChrisTerBeke	d0513e40e1	Remove crappy implementation	2018-12-04 22:21:36 +01:00