3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
34356 commits 302 branches 270 tags 770 MiB
Commit graph

1839 commits

Author SHA1 Message Date
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
ChrisTerBeke
9d6bd4b29a
Check access token before using it 2019-02-08 21:03:59 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +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
473633de2c
Merge branch '4.0' 2019-02-08 11:28:06 +01:00
Ghostkeeper
672271d525
Fix running automated tests on Python 3.6 
This prevents the PyCapsule_GetPointer error.
 2019-02-08 09:50:20 +01:00
Ian Paschal
729f4c9d52 Revert "Fix line length" 
This reverts commit 19f1a2f2d0.
 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
Ian Paschal
2b6bab9552 Re-enable firmware check 
Contributes to CL-1222
 2019-02-06 16:42:26 +01:00
Ian Paschal
fcb52dd1cf Show cloud flow pop-up if machine is removed from cloud 
Contributes to CL-1222
 2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4 Improve conditions for starting cloud flow 
Contributes to CL-1222
 2019-02-06 13:58:33 +01:00
Simon Edwards
8e569126ff Use the older but backwards compatible API for moving print jobs in the queue. 
CL-1237
 2019-02-06 12:19:59 +01:00
Ian Paschal
3a4fcb354a Show cloud connection flow pop-up 
Contributes to CL-1222
 2019-02-06 12:04:15 +01:00
Ian Paschal
b1104124f3 Add address property to ClusterUM3OutputDevice 
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)

Contributes to CL-1222
 2019-02-06 12:01:42 +01:00
Ian Paschal
348689eace Add cloud flow graphics 
Contributes to CL-1222
 2019-02-06 11:58:51 +01:00
Ian Paschal
5c0c176730 Show confirmation pop-up for cloud flow 
Contributes to CL-1222
 2019-02-05 16:52:15 +01:00
Ian Paschal
70c384bd4e Finish adding cloud flow checks 
Contributes to CL-1222
 2019-02-05 16:51:47 +01:00
Ian Paschal
b29f3d3bd0 Improve comment 
Contributes to CL-1222
 2019-02-05 16:50:50 +01:00
Ian Paschal
c41e81a6b9 Set required firmware version for cloud to 5.2.0 
Contributes to CL-1222
 2019-02-05 16:50:36 +01:00
Ian Paschal
d022672bcf Add signal to CloudOutputDeviceManager for added cloud device 
Contributes to CL-1222
 2019-02-05 16:49:54 +01:00
Ian Paschal
9c82cfd6fa Comment out firmware check for dev purposes 
Contributes to CL-1222
 2019-02-04 16:52:01 +01:00
Ian Paschal
4c1131a7b4 Remove some redundant calls 
Contributes to CL-1222
 2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f Add firmware check 
Contributes to CL-1222
 2019-02-04 16:02:38 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen 
This is a new text that we got from marketing.
 2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f Stop using depreciated API call 2019-02-04 11:53:24 +01:00
Ian Paschal
2a3a1d6e35 Move cloud flow checks back to UM3OutputDevice 
Contributes to CL-1222
 2019-02-04 11:51:27 +01:00
Ian Paschal
1244e30500 Add cloud-flow-is-possible checking 
Contributes to CL-1222
 2019-02-01 15:50:49 +01:00
Jaime van Kessel
4aaeb8c2d5 Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0 2019-02-01 11:54:35 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +01:00
Ghostkeeper
25b18dee7a
Fix type errors 
Nothing really changed but it should be more type-safe now for the messages it creates and the build plate temperature.
 2019-01-28 16:14:01 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00
Simon Edwards
72b98285b1
Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer 
CL-1188 hide print job on unavailable printer
 2019-01-28 11:08:21 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
f6b69f05a9 Add empty state for print job queue 
Contributes to CL-1154
 2019-01-24 15:14:16 +01:00
Ian Paschal
3d92bd0133 Prevent endless skeleton loading on Cloud 
Contributes to CL-1154

For you @christerbeke
 2019-01-24 14:46:00 +01:00
Ian Paschal
e7151390f7 Label printers without connection to "unreachable" 
Contributes to CL-1188
 2019-01-24 10:24:55 +01:00
Ian Paschal
673734ee12 Show print job context menu if state == "error" 
Contributes to CL-1175
 2019-01-24 09:52:56 +01:00
Ian Paschal
5d2a914180 Always show context menu for print jobs 
Contributes to CL-1175
 2019-01-23 15:54:11 +01:00