ChrisTerBeke
5db6bd9a9b
Send content type to API when uploading print job
2018-12-03 17:09:04 +01:00
Daniel Schiavini
2b8c9c17bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-03 16:39:24 +01:00
Daniel Schiavini
186c2cf3f5
START-322: Python 3.5 compatibility
2018-12-03 16:35:51 +01:00
ChrisTerBeke
ddf958d39a
Fix typing in CloudOutputDevice
2018-12-03 16:23:44 +01:00
ChrisTerBeke
24b75d781e
Fix merge conflict
2018-12-03 15:58:25 +01:00
Daniel Schiavini
f8f6670cae
STAR-322: Letting models convert sub-models
2018-12-03 15:06:01 +01:00
Daniel Schiavini
fc26ccd6fa
STAR-332: Some improvements to get the job in connect
2018-12-03 14:41:36 +01:00
Ian Paschal
a28cae0a43
Improve date rendering
...
- Use "Mon Dec 3 at 12:39" if 7 days or more away.
- Use "Mon at 12:39" if within 7 days but more than one away.
- Use "tomorrow at 12:39" if one day away.
- Use "today at 12:39" if today.
Contributes to CL-1153
2018-12-03 12:18:33 +01:00
Daniel Schiavini
8066074a2f
STAR-332: Fixing warnings
2018-12-03 11:02:49 +01:00
Jaime van Kessel
36a86adc0f
Remove spammy log
2018-11-30 16:08:19 +01:00
Marijn Deé
8b42b84618
Made a start with uploading jobs to the printer
2018-11-30 16:07:20 +01:00
Marijn Deé
763291821f
Added models to process the data from the api results
...
Added code to update the UI models
2018-11-29 17:03:11 +01:00
Marijn Deé
8a72ba3cfa
Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device
2018-11-29 10:00:57 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
...
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Ian Paschal
370fa0fd14
Remove old sidebar
...
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
ChrisTerBeke
26f107d176
Use cluster_id as dict key, remove unneeded white space
2018-11-27 17:03:19 +01:00
ChrisTerBeke
4e150fb4bf
Merge branch 'master' into cloud-output-device
2018-11-27 16:59:28 +01:00
Marijn Deé
fd4d1113b9
use right plural in variable name
2018-11-27 15:42:26 +01:00
Marijn Deé
172e003e1b
Removed the inital call to clusters
2018-11-27 14:53:23 +01:00
Marijn Deé
fb019ba987
In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters
2018-11-27 14:48:47 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
...
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Lipu Fei
edf8460619
Return empty material model for empty material
...
CURA-5982
2018-11-27 10:35:19 +01:00
ChrisTerBeke
efd5f3799b
Also catch TypeError now that we have explicit arguments
2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece
Fix typing syntax
2018-11-26 16:19:01 +01:00
ChrisTerBeke
2d7588903c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 15:55:34 +01:00
ChrisTerBeke
e4d8fb36ab
Add more typing as per request from @sedwards2009
2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876
add typing to models
2018-11-26 15:30:30 +01:00
ChrisTerBeke
aaf0f69820
Fix some more relative imports
2018-11-26 15:10:36 +01:00
ChrisTerBeke
42ccabc7b6
Fix relative imports for plugin
2018-11-26 15:09:56 +01:00
ChrisTerBeke
39f92ced90
Comment out test
2018-11-26 15:02:52 +01:00
ChrisTerBeke
269d596f5d
Fix typing for cluster list
2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7
Cleanup plugin imports
2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982
Use BaseModel for CloudCluster, some fixes
2018-11-26 14:51:24 +01:00
ChrisTerBeke
7654f1c71c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:30:50 +01:00
Marijn Deé
a382b77eaa
Added validation to the models
2018-11-26 14:30:17 +01:00
ChrisTerBeke
89e88a73bb
Temporary patch for when printer has one or more materials not installed
2018-11-26 14:11:20 +01:00
ChrisTerBeke
45159f7a80
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:09:13 +01:00
ChrisTerBeke
68a90ec510
Use simple models instead of namedtuples
...
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
ChrisTerBeke
014b1d6e4e
test
2018-11-26 13:45:37 +01:00
ChrisTerBeke
21c81603b4
Use application singleton instead of locally cached application
2018-11-26 13:33:14 +01:00
Marijn Deé
908628e2aa
Added a model to represent a cluster
2018-11-26 10:47:53 +01:00
Aleksei S
2b45262a85
Added test for definition container
...
CURA-5977
2018-11-23 17:01:05 +01:00
ChrisTerBeke
1adf1096a3
Merge branch 'master' into cloud-output-device
2018-11-23 14:17:26 +01:00
ChrisTerBeke
cf27a211df
Remove unused TYPE_CHECKING import
2018-11-23 14:15:40 +01:00
ChrisTerBeke
ef5ca6f5a9
Remove unused typing import
2018-11-23 14:15:21 +01:00
ChrisTerBeke
3e100775df
Fix instantiating CloudOutputDeviceManager
2018-11-23 14:14:35 +01:00
ChrisTerBeke
8ee39c0489
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-23 14:08:55 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
...
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
Marijn Deé
294527f7fe
Review changes
2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de
Used duoble quotes iso single quotes
2018-11-23 09:20:19 +01:00
