Daniel Schiavini
54744b46a7
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 16:15:19 +01:00
Daniel Schiavini
9046b39b43
STAR-322: Creating a Cloud API client to handle the interaction
2018-12-04 16:14:08 +01:00
Marijn Deé
a9273ec2b5
Use QTimer instead of threading.Timer
2018-12-04 15:20:24 +01:00
ChrisTerBeke
a79cfcbe47
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 14:22:17 +01:00
ChrisTerBeke
e98f3bff38
Implement test version of showing cloud connected printers in list
2018-12-04 14:09:20 +01:00
Marijn Deé
5d77209cfb
Be more efficient in updating the print jobs
2018-12-04 13:57:41 +01:00
ChrisTerBeke
97535ffa24
Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:23:38 +01:00
ChrisTerBeke
8e3e0c149e
fixes
2018-12-04 13:23:31 +01:00
Marijn Deé
02963eb9bf
Use a timer for the periodic update of the remote clusters and printjobs
2018-12-04 13:19:12 +01:00
Marijn Deé
99bdb9c93f
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-04 13:06:33 +01:00
Marijn Deé
894c69685a
Periodically update the remote clusters and printjobs
2018-12-04 13:06:27 +01:00
ChrisTerBeke
97607419cf
Start with some fakes for monitor page
2018-12-04 12:14:21 +01:00
ChrisTerBeke
12b3f0088d
Add content type to file upload
2018-12-04 10:07:43 +01:00
ChrisTerBeke
1bcabc6f42
Fix is_online logic
2018-12-03 23:44:52 +01:00
ChrisTerBeke
b50e942768
Describe TODO for association by hostname, only connect when online
2018-12-03 23:42:41 +01:00
ChrisTerBeke
c40d76f9ee
Fix formatting according to Cura code style
2018-12-03 23:13:24 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring
2018-12-03 22:12:18 +01:00
ChrisTerBeke
08e1b4691b
Remove TODO
2018-12-03 20:19:16 +01:00
ChrisTerBeke
8d6f109092
Set priority to 2
2018-12-03 20:11:53 +01:00
ChrisTerBeke
0852d2ebef
add one more TODO
2018-12-03 17:42:39 +01:00
ChrisTerBeke
d91efc656a
Add some more todo's for UI messages
2018-12-03 17:38:31 +01:00
ChrisTerBeke
90ec3f6cf9
Add TODO for progress messages
2018-12-03 17:22:21 +01:00
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
