21759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Lipu Fei	9e92a186ec	Fix code styles	2019-03-21 09:06:41 +01:00
Lipu Fei	f2d7f93101	Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action	2019-03-21 08:35:06 +01:00
Lipu Fei	7e176e0f2c	Fix merge conflicts	2019-03-21 08:34:07 +01:00
Remco Burema	8f9bd0ad06	Adapted to more review comments. [CURA-6294]	2019-03-20 17:20:06 +01:00
Remco Burema	9a2b800fe8	Future proof: also accept IPv6 address. [CURA-6294]	2019-03-20 17:01:37 +01:00
Remco Burema	1f2fea14ce	Little refactors (apply review comments). [CURA-6294]	2019-03-20 16:08:50 +01:00
drzejkopf	f03e5c28d7	Update creality_ender3.def.json	2019-03-20 16:00:40 +01:00
Lipu Fei	5d45dba8f3	Fix DiscoveredMachineModel test	2019-03-20 16:00:39 +01:00
Lipu Fei	c6bd31e5f6	Simplify code	2019-03-20 14:07:13 +01:00
Lipu Fei	8cc05a2a62	Bind no printer label visible to item count	2019-03-20 14:05:52 +01:00
Lipu Fei	91acbca141	Bind no printer label visible to item count	2019-03-20 14:05:02 +01:00
Lipu Fei	428fb5a3a1	Use Item instead of transparent Rectangle	2019-03-20 13:49:14 +01:00
Lipu Fei	95a0a5fb24	Theme window_disabled_background	2019-03-20 13:46:54 +01:00
Lipu Fei	a17642a5a1	Merge WIP_onboarding_by_ip	2019-03-20 13:42:15 +01:00
Lipu Fei	615241a416	Fix module renaming	2019-03-20 13:39:08 +01:00
Remco Burema	ad6603bab8	Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip	2019-03-20 13:33:19 +01:00
Remco Burema	61d2aa5c5f	No more hardcoded margins (and other QML fixes) in 'add-by-ip'. [CURA-6294]	2019-03-20 13:16:10 +01:00
Lipu Fei	79ab09ca01	Fix troubleshooting typos	2019-03-20 11:33:43 +01:00
Lipu Fei	c3c9c53f13	Merge WIP_onboarding	2019-03-20 11:28:30 +01:00