5766 Commits

Author	SHA1	Message	Date
Jaime van Kessel	df3485aaec	Add a where to buy link underneath the install button for material ... CURA-6148	2019-02-13 13:37:10 +01:00
Ghostkeeper	d2e1c47029	Use spaces instead of tabs ... Yeah, or remove extraneous tabs at the end of a line.	2019-02-11 08:53:42 +01:00
Ghostkeeper	51420c8311	Merge branch '4.0'	2019-02-08 14:23:36 +01:00
Ian Paschal	8807243108	Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Cloud flow pop-up (Finalize copy)	2019-02-08 14:09:53 +01:00
Ian Paschal	937dce591d	Finalize copy ... Contributes to CL-1222	2019-02-08 13:53:02 +01:00
Simon Edwards	1163d8f442	Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Cloud flow pop up	2019-02-08 13:26:03 +01:00
Ian Paschal	0dfcaadc49	Typecheck improvements ... Contributes to CL-1222	2019-02-08 13:13:26 +01:00
Ian Paschal	53e07eadd3	Allow for optional typing ... Contributes to CL-1222	2019-02-08 13:03:10 +01:00
Ian Paschal	2d77792988	Add some typings ... Contributes to CL-1222	2019-02-08 12:54:10 +01:00
Ghostkeeper	473633de2c	Merge branch '4.0'	2019-02-08 11:28:06 +01:00
Ghostkeeper	672271d525	Fix running automated tests on Python 3.6 ... This prevents the PyCapsule_GetPointer error.	2019-02-08 09:50:20 +01:00
Ian Paschal	5f0d9fc16a	Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top	2019-02-08 09:41:41 +01:00
Ian Paschal	729f4c9d52	Revert "Fix line length" ... This reverts commit 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.	2019-02-08 09:40:56 +01:00
Ghostkeeper	506ce2e6e5	Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section' ... Contributes to issue CURA-5916.	2019-02-08 09:32:56 +01:00
Ian Paschal	19f1a2f2d0	Fix line length ... Contributes to CL-1237	2019-02-08 09:23:38 +01:00
Diego Prado Gesto	b0cf5f25c6	Merge branch '4.0'	2019-02-07 17:36:44 +01:00
Jaime van Kessel	5c94a8223d	Added button that is shown when instruction_link is set in the profile ... CURA-5916	2019-02-07 16:08:50 +01:00
Ian Paschal	2b6bab9552	Re-enable firmware check ... Contributes to CL-1222	2019-02-06 16:42:26 +01:00
Remco Burema	3a94745667	Make sliders reappear in simulation-view. [CURA-6183]	2019-02-06 16:01:01 +01:00
Ian Paschal	fcb52dd1cf	Show cloud flow pop-up if machine is removed from cloud ... Contributes to CL-1222	2019-02-06 14:26:11 +01:00
Ian Paschal	162fdad4e4	Improve conditions for starting cloud flow ... Contributes to CL-1222	2019-02-06 13:58:33 +01:00
Simon Edwards	8e569126ff	Use the older but backwards compatible API for moving print jobs in the queue. ... CL-1237	2019-02-06 12:19:59 +01:00
Ian Paschal	3a4fcb354a	Show cloud connection flow pop-up ... Contributes to CL-1222	2019-02-06 12:04:15 +01:00
Ian Paschal	b1104124f3	Add address property to ClusterUM3OutputDevice ... This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings) Contributes to CL-1222	2019-02-06 12:01:42 +01:00
Ian Paschal	348689eace	Add cloud flow graphics ... Contributes to CL-1222	2019-02-06 11:58:51 +01:00
Ian Paschal	5c0c176730	Show confirmation pop-up for cloud flow ... Contributes to CL-1222	2019-02-05 16:52:15 +01:00
Ian Paschal	70c384bd4e	Finish adding cloud flow checks ... Contributes to CL-1222	2019-02-05 16:51:47 +01:00
Ian Paschal	b29f3d3bd0	Improve comment ... Contributes to CL-1222	2019-02-05 16:50:50 +01:00
Ian Paschal	c41e81a6b9	Set required firmware version for cloud to 5.2.0 ... Contributes to CL-1222	2019-02-05 16:50:36 +01:00
Ian Paschal	d022672bcf	Add signal to CloudOutputDeviceManager for added cloud device ... Contributes to CL-1222	2019-02-05 16:49:54 +01:00
Lipu Fei	4ea6e5d0df	Merge remote-tracking branch 'origin/4.0'	2019-02-05 11:40:50 +01:00
Lipu Fei	cfdadbaffb	Merge pull request #5270 from Ultimaker/action_panel_per_stage ... Let each stage create its own action panel	2019-02-05 11:16:00 +01:00
Jaime van Kessel	d57d4fd277	Fix text color not being themed	2019-02-05 11:05:33 +01:00
Ian Paschal	9c82cfd6fa	Comment out firmware check for dev purposes ... Contributes to CL-1222	2019-02-04 16:52:01 +01:00
Ian Paschal	4c1131a7b4	Remove some redundant calls ... Contributes to CL-1222	2019-02-04 16:11:48 +01:00
Ian Paschal	f2ddb2808f	Add firmware check ... Contributes to CL-1222	2019-02-04 16:02:38 +01:00
Ghostkeeper	a831cfa558	Configure whether preview shortcut is visible from ActionPanelWidget property ... This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible. Contributes to issue CURA-6086.	2019-02-04 15:19:09 +01:00
Ghostkeeper	5992e66ed6	Move action panel into each stage ... They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button. Contributes to issue CURA-6086.	2019-02-04 15:08:59 +01:00
Ghostkeeper	e7d2400199	Merge branch '4.0'	2019-02-04 13:06:32 +01:00
Ghostkeeper	7d871e5a18	Update text for pre-login screen ... This is a new text that we got from marketing.	2019-02-04 13:06:06 +01:00
Ian Paschal	66ed42838f	Stop using depreciated API call	2019-02-04 11:53:24 +01:00
Ian Paschal	2a3a1d6e35	Move cloud flow checks back to UM3OutputDevice ... Contributes to CL-1222	2019-02-04 11:51:27 +01:00
Ghostkeeper	314070acbc	Merge branch 'griehsler-master'	2019-02-04 08:26:10 +01:00
Ghostkeeper	5592d4fa60	Don't make retraction distance negative ... Apparently this got changed accidentally because of a merge in an unfortunate time.	2019-02-04 08:25:35 +01:00
Ghostkeeper	3018b1b3d4	Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master	2019-02-04 08:22:55 +01:00
Ian Paschal	1244e30500	Add cloud-flow-is-possible checking ... Contributes to CL-1222	2019-02-01 15:50:49 +01:00
Jaime van Kessel	4aaeb8c2d5	Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0	2019-02-01 11:54:35 +01:00
Diego Prado Gesto	f7ffb3ae69	Merge pull request #4825 from Frischid/patch-2 ... Update AutoDetectBaudJob.py	2019-02-01 11:31:02 +01:00
Lipu Fei	efa26c8323	Merge remote-tracking branch 'origin/4.0'	2019-02-01 11:08:33 +01:00
Lipu Fei	18cec8dbe8	Fix typing ... CURA-6153	2019-02-01 10:20:16 +01:00