22028 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	fd015c0381	Detach the data request and the showing of the dialog from eachother. ... This way we can fetch the data without having to show the marketplace. CURA-6151	2019-03-22 11:30:22 +01:00
Tim Kuipers	709321fc0c	Change image import options for standard lithophanes	2019-03-22 11:22:30 +01:00
Lipu Fei	378c6da7ed	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-22 11:17:36 +01:00
Lipu Fei	090e176969	Arrange CloudContent.qml differently	2019-03-22 11:15:43 +01:00
Lipu Fei	1e3945810f	Remove text_light_blue and use primary	2019-03-22 10:50:03 +01:00
Jaime van Kessel	9a5b7e7925	Set min value for adaptive_layer_height_variation_step ... This is to prevent using 0, since that crashes the engine	2019-03-22 10:44:47 +01:00
Lipu Fei	03155d24da	Remove unneeded property assignment	2019-03-22 10:43:01 +01:00
Lipu Fei	e632b508eb	Rename to AddNetworkOrLocalPrinterContent	2019-03-22 10:43:01 +01:00
Lipu Fei	639c4ba9f6	Remove unneeded property assignment	2019-03-22 10:35:41 +01:00
Lipu Fei	ab06264950	Rename to AddNetworkOrLocalPrinterContent	2019-03-22 10:28:17 +01:00
Lipu Fei	77720c9039	Fix merge conflicts	2019-03-22 10:25:07 +01:00
Lipu Fei	4573733bb7	Remove unnecessary "visible: true"	2019-03-22 10:22:19 +01:00
Lipu Fei	2b0e2d84bb	Rename gotoPage to goToPage	2019-03-22 10:21:17 +01:00
Lipu Fei	a8e2fcf5f5	Add comments for properties in AddPrinterByIpContent	2019-03-22 10:19:38 +01:00
Lipu Fei	0c8afbfa45	Use Item instead of Rectangle	2019-03-22 10:14:34 +01:00
Lipu Fei	c4d2cb26a0	Fix comments	2019-03-22 10:07:26 +01:00
Lipu Fei	528a6b651d	Fix code style	2019-03-22 10:06:47 +01:00
Lipu Fei	80dff49b8a	Fix merge conflicts	2019-03-22 10:00:57 +01:00
Lipu Fei	47d74950dc	Add docs for properties in AddLocalPrinterScrollView.qml	2019-03-22 09:59:07 +01:00
Lipu Fei	f90fd8aee8	Add typing	2019-03-22 09:50:32 +01:00
Lipu Fei	b1620f1912	Fix typing	2019-03-22 09:49:40 +01:00
Lipu Fei	d3ea506167	Add docs for createMachineFromDiscoveredPrinter	2019-03-22 09:47:13 +01:00
MaukCC	c314352940	Merge pull request #10 from Ultimaker/master ... update	2019-03-22 09:42:06 +01:00
Lipu Fei	9265a0de4a	Fix typing	2019-03-22 09:41:12 +01:00
Ghostkeeper	294b61937a	Re-enable Polish	2019-03-21 21:14:11 +01:00
Remco Burema	8250c91fc4	Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294]	2019-03-21 18:45:57 +01:00
Diego Prado Gesto	6611ab7d17	Merge branch 'master' of github.com:Ultimaker/Cura	2019-03-21 16:10:09 +01:00
Diego Prado Gesto	6ad6115327	Modify the firmware checker url to use the new file location	2019-03-21 16:07:26 +01:00
Lipu Fei	c3175e5322	Theme welcome_pages_button	2019-03-21 16:01:50 +01:00
Lipu Fei	f13ceb2a4d	Use default margin for network printer button	2019-03-21 15:53:21 +01:00
Lipu Fei	570b6b9804	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 15:49:12 +01:00
Lipu Fei	bff9287094	Simplify the horizontal-line in network printer panel	2019-03-21 15:47:17 +01:00
Lipu Fei	6742348a95	Theme radio_button size	2019-03-21 15:20:39 +01:00
Lipu Fei	11252ce0f7	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 15:00:15 +01:00
Lipu Fei	4e5d08f320	Fix merge conflicts with master	2019-03-21 14:59:53 +01:00
Ghostkeeper	20a4d89847	Merge branch 'drzejkopf-patch-5'	2019-03-21 14:43:37 +01:00
Ghostkeeper	07010c7cec	Merge branch 'patch-5' of https://github.com/drzejkopf/Cura into drzejkopf-patch-5	2019-03-21 14:42:09 +01:00
Jaime van Kessel	a5ce34f548	Merge branch 'master' of github.com:Ultimaker/Cura	2019-03-21 14:32:59 +01:00
Jaime van Kessel	620cd9c45d	Change the comment of the UFP mimetype to the correct description	2019-03-21 14:32:27 +01:00
Diego Prado Gesto	0eb295be16	Add the new TPU 1.75mm filament to the list of excluded materials for some printers ... Contributes to CURA-6121.	2019-03-21 14:29:23 +01:00
Jaime van Kessel	3f02ad7619	Merge branch 'feature_ufp_reader' of github.com:Ultimaker/Cura	2019-03-21 14:27:51 +01:00
Diego Prado Gesto	fceffce56e	Show the slider in the middle when there is only one quality profile available. ... Contributes to CURA-6121.	2019-03-21 14:18:07 +01:00
Lipu Fei	3db6b74b36	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 09:58:48 +01:00
Lipu Fei	0671f68616	Remove unnecessary code	2019-03-21 09:57:20 +01:00
Remco Burema	139edbb0b7	Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip ... 'WIP-onboarding-by-ip' into 'parent' branch	2019-03-21 09:52:39 +01:00
Diego Prado Gesto	a58c3997d4	Merge branch '4.0'	2019-03-21 09:36:52 +01:00
Diego Prado Gesto	59b3046c0f	Remove duplicate shortcut in Polish ... Contributes to CURA-6257.	2019-03-21 09:35:51 +01:00
Lipu Fei	aa1ad9a93d	Fix merge conflicts	2019-03-21 09:31:24 +01:00
Lipu Fei	85a3b54111	Merge WIP_onboarding	2019-03-21 09:21:56 +01:00
Lipu Fei	cf5fd1c355	Fix typing	2019-03-21 09:13:00 +01:00