18517 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	aefacde7d5	Merge branch 'master' of github.com:Ultimaker/Cura	2019-02-15 13:19:48 +01:00
Jaime van Kessel	1e280c2869	Check if every quality is matched to an existing definition	2019-02-15 13:18:18 +01:00
Jaime van Kessel	98704e72a2	Added validation test for all qualities shipped with Cura ... This checks if the qualities are atleast formatted righ.	2019-02-15 13:09:42 +01:00
Satish	4a0bb43e39	CURA-6201 - Added an id to stage buttons for the integration tests	2019-02-15 12:08:42 +01:00
Ghostkeeper	73524deb8d	Add settingKey property for Squish to find things easier	2019-02-15 11:52:16 +01:00
Diego Prado Gesto	25c9bb20c3	Merge branch 'ValentinPitre-contribution'	2019-02-14 17:14:55 +01:00
Diego Prado Gesto	b53e5a963e	Change setting version to 7 ... Contributes to CURA-6203.	2019-02-14 17:13:34 +01:00
Lipu Fei	bfb02f68d9	Merge pull request #5300 from Ultimaker/CURA-6148-Add_where_to_buy_link ... Add a where to buy link underneath the install button for material	2019-02-14 14:54:26 +01:00
Ghostkeeper	8c3f7a065d	Remove unused import ... Discovered during work on CURA-5787.	2019-02-14 13:54:03 +01:00
Ghostkeeper	6e883c0431	Use default parameter of getMetaDataEntry ... We don't need to do that manually.	2019-02-14 13:33:01 +01:00
Ghostkeeper	e2a7a68883	Give a warning when you can't update metadata because it's read-only ... This bit me in the bum today.	2019-02-14 13:26:20 +01:00
Diego Prado Gesto	b06113f807	Merge branch 'contribution' of https://github.com/ValentinPitre/Cura into ValentinPitre-contribution	2019-02-14 11:57:22 +01:00
Diego Prado Gesto	0a325426d0	Merge branch 'Z-Bolt-master'	2019-02-14 11:24:57 +01:00
Diego Prado Gesto	bdd4b6438e	Add extruder file for Z-Bolt printers. ... Contributes to CURA-6193.	2019-02-14 11:24:00 +01:00
Remco Burema	a392f50a67	Small fix for glue-warning height in Ext.-config.	2019-02-14 11:21:01 +01:00
Diego Prado Gesto	100be642bd	Merge branch 'master' of https://github.com/Z-Bolt/Cura into Z-Bolt-master	2019-02-14 11:15:25 +01:00
Jaime van Kessel	a8f66a558c	Merge branch '4.0' of github.com:Ultimaker/Cura	2019-02-14 10:53:01 +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
Remco Burema	7698ea0df2	Merge pull request #5260 from Ultimaker/CURA-6144_support_extruder_combobox_style ... CURA-6144 Fix combox style for support extruder in recommended	2019-02-13 16:55:21 +01:00
Ian Paschal	e39e09a692	Fix incorrect method name ... Contributes to CL-1165	2019-02-13 15:21:09 +01:00
ValentinPitre	2515f51e81	correction of settings	2019-02-13 14:48:02 +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
Jaime van Kessel	face8d4799	Moved logic of isDefinitionvalid to it's own function ... This should make it easier in the future to add checks for the extruders as well	2019-02-13 14:11:46 +01:00
Jaime van Kessel	9b76124d11	Ensured that the validateDefinitionContainer checks a single definition per test	2019-02-13 14:02:38 +01:00
Jaime van Kessel	f35ad5cf83	Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura	2019-02-13 14:02:09 +01:00
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
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
Lipu Fei	c237222d3c	Minor change to QML ... CURA-6144	2019-02-13 11:28:28 +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
Aleksei Kvitinskii	22f7d30197	merged extruders and replace value with default_value	2019-02-12 21:13:53 +03: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
Ghostkeeper	5b9fb20b9a	Remove unused imports	2019-02-12 11:48:23 +01:00
Remco Burema	c50fcf42c5	Fix crash on no output devices in list.	2019-02-12 11:39:03 +01:00
ValentinPitre	696289d348	add tizyx evy printer	2019-02-11 19:36:32 +01:00
Jaime van Kessel	ad8c269012	Merge pull request #5289 from ishchenko/patch-1 ... Fix Anycubic i3 Mega has_materials	2019-02-11 15:13:32 +01:00
Jaime van Kessel	ec5da1d210	Fix failing unit test	2019-02-11 13:30:32 +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
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
Max Ishchenko	8e8bb93096	Fix #4867	2019-02-10 09:17:45 +03:00
ChrisTerBeke	a7071e2d3d	Fix unit tests	2019-02-08 22:53:12 +01:00