Commit graph

10 commits

Author SHA1 Message Date
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Jaime van Kessel
8f22e62675
Fix typing issues
CURA-7290
2020-05-18 13:47:03 +02:00
Nino van Hooff
5eb5ffd916 Convert doxygen to rst for UM3NetworkPrinting 2020-05-15 15:05:38 +02:00
Nino van Hooff
f3c66c3189 Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager
Has the benefit of a more unified Http request management + timeouts

CURA-7290
2020-05-15 11:28:17 +02:00
Ghostkeeper
dcac9b6a87
Prevent a crash when retrying even though it completed in the meanwhile
Fixes Sentry issue CURA-NA.
2020-04-29 14:07:03 +02:00
ChrisTerBeke
0ba8bf13e1 Fix copyright year to 2019 2019-08-02 15:09:37 +02:00
ChrisTerBeke
4b212d6c05 Merge more stuff, re-use models for local networking as well 2019-07-29 14:53:50 +02:00
ChrisTerBeke
3c1b377308 Restructure codebase - part 1 2019-07-26 15:07:52 +02:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
Renamed from plugins/UM3NetworkPrinting/src/Cloud/MeshUploader.py (Browse further)