21201 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ian Paschal	fc650865d6	Improved cloud pop-up ... Contributes to CL-1287	2019-03-22 15:24:12 +01:00
Ian Paschal	2233543780	Only set "do not show cloud message" metadata if active machine is the added cloud cluster ... Contributes to CL-1267	2019-03-22 14:53:55 +01:00
Ian Paschal	9aef692082	Emit added or removed clusters ... Useful to whomever is listening in on those signals to know _what_ was added or removed. Contributes to CL-1267	2019-03-22 14:52:11 +01:00
Lipu Fei	85b28a0c90	Use themed values for margins	2019-03-22 14:34:02 +01:00
Lipu Fei	6f911f9924	Use rounding for width	2019-03-22 14:29:32 +01:00
Lipu Fei	ec0b197b6e	Fix merge conflicts	2019-03-22 14:28:23 +01:00
Lipu Fei	a9431b270f	Rearrange items in WelcomeContent.qml	2019-03-22 14:19:26 +01:00
Lipu Fei	f8c4cee2de	Simplify user agreement page layout	2019-03-22 13:50:02 +01:00
Remco Burema	b25df557d3	Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding	2019-03-22 13:20:43 +01:00
Remco Burema	8de055dd33	Adjust add-by-ip to latest review comments. [CURA-6294]	2019-03-22 13:19:19 +01:00
Lipu Fei	eb02b302f5	Rearrange items in DataCollectionsContent.qml	2019-03-22 13:18:33 +01:00
Remco Burema	1f75d00cd3	Adapt add-by-ip-qml to handle unresponsive address. [CURA-6294]	2019-03-22 13:10:31 +01:00
Lipu Fei	457eb93758	Remove debug code	2019-03-22 13:08:51 +01:00
Lipu Fei	2074bf9133	Use theme	2019-03-22 13:06:57 +01:00
Lipu Fei	26acad3dbc	Cleanup unnecessary hard-coded numbers in styling	2019-03-22 12:55:45 +01:00
Lipu Fei	67428aee53	Cleanup unnecessary hard-coded numbers in styling	2019-03-22 12:55:25 +01:00
Lipu Fei	a2c2424d69	Use Label for SignIn button	2019-03-22 12:24:11 +01:00
Lipu Fei	9e7c687853	Fix merge conflicts	2019-03-22 12:07:59 +01:00
Remco Burema	794d13969a	Shorter log messages for operations.	2019-03-22 12:06:04 +01:00
Lipu Fei	2f33beff36	Fix cloud image filename	2019-03-22 11:57:33 +01:00
Jaime van Kessel	86f4fd65c3	Add a property that lists all ID's that have an update available ... CURA-6151	2019-03-22 11:56:53 +01:00
Lipu Fei	92dea8a52f	Add welcome_pages_default_margin	2019-03-22 11:50:10 +01:00
Tim Kuipers	32d79451cc	fix color inversion and make variable naming descriptive	2019-03-22 11:42:31 +01:00
Tim Kuipers	bdf102ea64	make description of color invert explanatory, rather than purely descriptive.	2019-03-22 11:30:58 +01:00
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