ChrisTerBeke
|
2f92f6ef50
|
Simplify checking if cloud or network printer, small fixes
|
2018-12-20 13:45:59 +01:00 |
|
Lipu Fei
|
68372aff60
|
Use MaterialManager in SendMaterialJob
CURA-6035
|
2018-12-20 10:45:40 +01:00 |
|
Remco Burema
|
9dbc642967
|
SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035]
|
2018-12-19 17:34:31 +01:00 |
|
ChrisTerBeke
|
beb68213f4
|
Remove much logging or use debug level, fix cloud icon not appearing right away
|
2018-12-19 14:14:44 +01:00 |
|
ChrisTerBeke
|
cf06cb5351
|
Do not call printer_device.key before checking if it exists
|
2018-12-19 12:10:24 +01:00 |
|
ChrisTerBeke
|
d2746d03c1
|
Fix type checking for DiscoverUM3Action
|
2018-12-19 11:56:43 +01:00 |
|
ChrisTerBeke
|
5e9fe3fe50
|
Fix some codestyle, make connectionType a property as it's needed in QML
|
2018-12-19 11:21:50 +01:00 |
|
ChrisTerBeke
|
0588c54035
|
Start work on cloud icon
|
2018-12-18 16:29:13 +01:00 |
|
ChrisTerBeke
|
25caf1a087
|
Fix merge conflicts
|
2018-12-18 14:44:13 +01:00 |
|
Jaime van Kessel
|
84a7f2e5a2
|
Fix review comments
CURA-6011
|
2018-12-18 09:40:08 +01:00 |
|
ChrisTerBeke
|
74bec96ce8
|
Fix a relative import
|
2018-12-17 17:41:02 +01:00 |
|
Daniel Schiavini
|
c5f438819a
|
STAR-322: Improving documentation
|
2018-12-17 15:11:01 +01:00 |
|
Daniel Schiavini
|
d28ac5e120
|
STAR-322: Improving documentation
|
2018-12-17 14:57:57 +01:00 |
|
Daniel Schiavini
|
da974d9868
|
STAR-322: Improving documentation
|
2018-12-17 14:51:57 +01:00 |
|
Daniel Schiavini
|
75d7d49349
|
STAR-322: Mocking the CuraApp
|
2018-12-17 14:41:28 +01:00 |
|
Daniel Schiavini
|
34f56b046a
|
STAR-322: Review comments
|
2018-12-17 13:13:44 +01:00 |
|
Daniel Schiavini
|
9eb743bcb8
|
STAR-322: Making mypy happy
|
2018-12-17 12:01:10 +01:00 |
|
Daniel Schiavini
|
9f4b7bd703
|
STAR-322: Improving logging and cluster connection
|
2018-12-17 11:28:16 +01:00 |
|
Jaime van Kessel
|
b8a4d8e80d
|
Remove the cluster connection type
CURA-6011
|
2018-12-14 17:14:56 +01:00 |
|
Jaime van Kessel
|
226d052468
|
Move the machines from machinelist into their own model
CURA-6011
|
2018-12-14 17:10:58 +01:00 |
|
Daniel Schiavini
|
3194a6d0bb
|
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
|
2018-12-14 16:17:36 +01:00 |
|
Daniel Schiavini
|
e815d5da8f
|
STAR-322: Avoiding lambdas and direct callbacks to avoid gc
|
2018-12-14 16:02:28 +01:00 |
|
Daniel Schiavini
|
2f08854097
|
STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished
|
2018-12-14 14:50:15 +01:00 |
|
Daniel Schiavini
|
4dc8edb996
|
STAR-322: Fixing the multipart upload
|
2018-12-14 12:48:40 +01:00 |
|
Lipu Fei
|
aba3b6dd8e
|
Rename setKey() and add docs
CURA-6011
|
2018-12-14 10:55:36 +01:00 |
|
Lipu Fei
|
6bf39a32a9
|
Rename Enum names to camal cases
CURA-6011
|
2018-12-14 09:56:10 +01:00 |
|
Aleksei S
|
973970a895
|
Every print ouput device should define its connection type(usb, network, cluster and etc)
CURA-6011
|
2018-12-13 16:00:12 +01:00 |
|
ChrisTerBeke
|
819f8531a2
|
Use CuraConstants for Cloud printing API root
|
2018-12-13 11:54:10 +01:00 |
|
Daniel Schiavini
|
fed779d0d2
|
STAR-322: Implementing multi-part upload (doesnt always work)
|
2018-12-12 17:31:08 +01:00 |
|
Daniel Schiavini
|
0467756ed6
|
STAR-322: Adding return type to init method
|
2018-12-11 16:01:52 +01:00 |
|
Daniel Schiavini
|
f04db63594
|
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 14:28:07 +01:00 |
|
Daniel Schiavini
|
a5d8e6ceb8
|
STAR-322: Removing the print job after it was done
|
2018-12-11 14:28:00 +01:00 |
|
ChrisTerBeke
|
7b7c687db7
|
Remove dismissable = False from messages as it's the default
|
2018-12-11 12:46:05 +01:00 |
|
ChrisTerBeke
|
e52339a424
|
Fix typing for output_device param in cloud output controller
|
2018-12-11 12:44:37 +01:00 |
|
Daniel Schiavini
|
073e8cd6dc
|
Merge branch 'master' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 12:39:02 +01:00 |
|
Diego Prado Gesto
|
4949f39c34
|
Add translatable strings to empty and unknown material
Contributes to CL-1160.
|
2018-12-11 12:10:32 +01:00 |
|
Daniel Schiavini
|
4fddf1b7c7
|
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
|
2018-12-11 11:56:43 +01:00 |
|
Daniel Schiavini
|
d54fc4182b
|
STAR-322: Fixing style errors
|
2018-12-11 11:56:36 +01:00 |
|
Diego Prado Gesto
|
70b0d16fa4
|
Fix typo
Missing parenthesis.
Contributes to CL-1160.
|
2018-12-11 11:53:26 +01:00 |
|
Diego Prado Gesto
|
2b2e8ebb31
|
Add some safety checks when checking for the guid of the material
Don't crash if the guid doesn't exist.
Contributes to CL-1160.
|
2018-12-11 11:37:01 +01:00 |
|
ChrisTerBeke
|
816c6bd4ec
|
Fixes after merging UI changes
|
2018-12-11 11:12:36 +01:00 |
|
Daniel Schiavini
|
7668801564
|
STAR-322: Adding documentation and fixing model types
|
2018-12-11 11:12:32 +01:00 |
|
ChrisTerBeke
|
79430f9faf
|
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection
|
2018-12-11 10:56:38 +01:00 |
|
Ian Paschal
|
0f357e1078
|
Replace fix for 'None' materials
This was fixed in 4.0 and accidentally got reverted when merging another branch in.
Contributes to CL-1160
|
2018-12-11 10:51:05 +01:00 |
|
Daniel Schiavini
|
bfd236dae4
|
STAR-322: Testing cloud printing
|
2018-12-10 16:11:43 +01:00 |
|
Daniel Schiavini
|
d482924ea2
|
STAR-322: First tests for cloud output device
|
2018-12-10 14:43:02 +01:00 |
|
Ian Paschal
|
df4e5c40df
|
Rename ClusterMonitorItem
Contributes to CL-1152
|
2018-12-10 12:19:52 +01:00 |
|
Ian Paschal
|
8a856f13d2
|
Re-add config changes in monitor tab
Contributes to CL-1152
|
2018-12-10 11:36:51 +01:00 |
|
Daniel Schiavini
|
134f97d5f1
|
STAR-322: Finishing the output device manager tests
|
2018-12-10 11:30:02 +01:00 |
|
Daniel Schiavini
|
63c5b77959
|
STAR-322: Fixing finished jobs
|
2018-12-07 16:43:53 +01:00 |
|