18299 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	24bb4f0a4e	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-02-14 17:22:34 +01:00
Jaime van Kessel	6ff1f49c34	Ensure the layout gets the right width & height for the output devices popup ... CURA-6222	2019-02-14 17:21:54 +01:00
Lipu Fei	45af26879f	Merge pull request #5298 from Ultimaker/CURA-6120_arrange_child_nodes_fix ... Arrange child-nodes (like blocker) with parents. [CURA-6120]	2019-02-14 16:05:23 +01:00
Jaime van Kessel	dbb8514a6a	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-02-14 13:45:29 +01:00
Jaime van Kessel	b09538da63	Ensure that the numberOfExtruders property gets updated after configuration sync ... CURA-6220	2019-02-14 13:44:43 +01:00
Lipu Fei	0cc882a398	Merge pull request #5304 from Ultimaker/fix_um2_08_profiles ... CURA-6215 Remove layer_height from um2+ extruder profiles.	2019-02-14 12:05:49 +01:00
Remco Burema	0e329946f8	Small refactor (init set plain instead of with empty list). [CURA-6120]	2019-02-14 11:05:13 +01:00
Jaime van Kessel	c1b53f0a90	Change header color in about window ... This makes it work for both light & dark theme	2019-02-14 10:42:25 +01:00
Ian Paschal	e39e09a692	Fix incorrect method name ... Contributes to CL-1165	2019-02-13 15:21:09 +01:00
Simon Edwards	8f37421c11	Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Ensure pop-up is not shown if cloud connection is already configured	2019-02-13 14:30:40 +01:00
Simon Edwards	dc9d3ba2a3	Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info ... CL-1165 Improve cloud connection or not checking	2019-02-13 14:23:05 +01:00
Ian Paschal	25cfd4f496	Avoid double negatives in cloud flow metadata ... Contributes to CL-1222	2019-02-13 14:21:23 +01:00
Simon Edwards	d08b8d813d	Generate the correct path for the svg on Windows. ... CL-1222	2019-02-13 12:24:59 +01:00
Ian Paschal	cf4bcf81e7	Make pop up permanent ... Contributes to CL-1222	2019-02-13 11:49:53 +01:00
Ian Paschal	d74f4f36bd	Improve cloud flow checks ... Contributes to CL-1222	2019-02-13 11:30:31 +01:00
Ian Paschal	8fecf7fb39	Don't crash when clicking don't show again ... Contributes to CL-1222	2019-02-13 11:04:51 +01:00
Ian Paschal	c15e49876a	Revert "Use parseBool instead of "is True" and "is False"" ... This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.	2019-02-13 11:00:11 +01:00
Ian Paschal	aa2acac244	Fix typo ... Contributes to CL-1222	2019-02-13 10:52:37 +01:00
Ian Paschal	70fc363048	Fix cloud pop up paths ... Contributes to CL-1222	2019-02-13 10:49:53 +01:00
Remco Burema	a24dc00bc5	Arrange child-nodes (like blocker) with parents. [CURA-6120]	2019-02-12 18:08:17 +01:00
Jaime van Kessel	ebcdcb4987	Remove layer_height from um2+ extruder profiles. ... I've also doublechecked if the type of these profiles matches up and updated them where needed.	2019-02-12 14:00:16 +01:00
Ian Paschal	aa454ea357	Use parseBool instead of "is True" and "is False" ... Contributes to CL-1222	2019-02-12 12:18:29 +01:00
Ian Paschal	3c2791fefe	Improve cloud connection or not checking ... Contributes to CL-1165	2019-02-12 12:12:59 +01:00
Remco Burema	c6c0ed5f00	Fix sign-in size for cloud icon (and add for dark theme). ... Co-authored-by: Yi-An Lai <y.lai@ultimaker.com>	2019-02-12 11:57:01 +01:00
Remco Burema	c50fcf42c5	Fix crash on no output devices in list.	2019-02-12 11:39:03 +01:00
Ian Paschal	0e913044de	Ensure pop-up is not shown if cloud connection is already configured ... Contributes to CL-1222	2019-02-11 10:21:54 +01:00
ChrisTerBeke	14c361a297	Add comment to clarify usage of fallback date	2019-02-11 09:45:50 +01:00
ChrisTerBeke	a7071e2d3d	Fix unit tests	2019-02-08 22:53:12 +01:00
ChrisTerBeke	62c7ba5659	remove unused argument	2019-02-08 22:31:36 +01:00
ChrisTerBeke	4192c9e764	Fix typing issue	2019-02-08 22:30:31 +01:00
ChrisTerBeke	48c756b01d	Fixes for storing timestamp	2019-02-08 22:24:14 +01:00
ChrisTerBeke	05c4b6012e	Calculate expiry date to determine if token refresh is needed	2019-02-08 21:39:45 +01:00
ChrisTerBeke	9d6bd4b29a	Check access token before using it	2019-02-08 21:03:59 +01:00
Ghostkeeper	85607d0e68	Merge branch 'AddCC06PLAprofile' into 4.0	2019-02-08 14:23:11 +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	7080bc0dcc	Fix experimental label ... We have a system for this nowadays. Contributes to issue CURA-6196.	2019-02-08 12:03:08 +01:00
Jaime van Kessel	a1d08dab69	Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0	2019-02-08 10:51:08 +01:00
Jaime van Kessel	91f0d76c8a	Fix crash when user was logged in but there was no internet connection on boot	2019-02-08 10:50:17 +01:00
THeijmans	151c8919cd	Upload CC06 PLA profiles for TPM ... These are experimental for Ultimaker materials.	2019-02-08 10:42:43 +01:00
Ian Paschal	b77c41c5e6	Merge pull request #5279 from Ultimaker/CL-1237_fix_move_to_top ... Cl 1237 fix move to top	2019-02-08 09:54:45 +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
Ian Paschal	19f1a2f2d0	Fix line length ... Contributes to CL-1237	2019-02-08 09:23:38 +01:00
Jaime van Kessel	e869829f10	Updated the icon so it also works in the dark theme	2019-02-07 15:17:07 +01:00
Lipu Fei	e5071eac5b	Fix typing	2019-02-07 14:31:40 +01:00