ChrisTerBeke
620ba8f21d
Merge branch 'master' into cloud-output-device
2018-11-26 11:17:39 +01:00
Marijn Deé
908628e2aa
Added a model to represent a cluster
2018-11-26 10:47:53 +01:00
Marijn Deé
d8232caec0
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 10:14:34 +01:00
Marijn Deé
59510487fa
Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin
2018-11-26 09:50:40 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist
...
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
2018-11-26 09:40:14 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location
...
This crashes Cura on start-up for some people.
2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials
...
Without it, Cura simply won't start if you had a printer loaded with material profiles.
Fixes #4460 .
2018-11-26 08:30:24 +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
2fc5061c41
Fix some PR comments, cleanup imports
2018-11-23 14:11:43 +01:00
ChrisTerBeke
8ee39c0489
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-23 14:08:55 +01:00
ChrisTerBeke
e3894c291c
Merge branch 'tests-for-um3networkplugin' of https://github.com/Ultimaker/Cura into tests-for-um3networkplugin
2018-11-23 11:27:41 +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
alekseisasin
45076d9ca6
Merge pull request #4859 from Ultimaker/CURA-5878_gcode_file_association
...
CURA-5878 Update desktop and mimeinfo to add gcode mime type
2018-11-23 10:37:10 +01:00
Marijn Deé
76542a82d5
Removed the asserts on internals
2018-11-23 10:33:57 +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
Jaime van Kessel
7ecad41625
Merge pull request #4843 from Ultimaker/fix-oauth2-client
...
Switch Ultimaker Account OAuth2 client
2018-11-22 16:38:10 +01:00
Lipu Fei
06cb628699
Update desktop and mimeinfo to add gcode mime type
...
CURA-5878
2018-11-22 15:47:12 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles
...
CL-1148 Re-styling monitor queue tiles
2018-11-22 15:08:42 +01:00
Ian Paschal
963b8aa974
Fix QML warnings
...
Contributes to CL-1148
2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9
Use array for extruder configurations
...
Contributes to CL-1148
2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f
Silence binding loop
...
Contributes to CL-1148
2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94
Remove unnecessary "else"
...
Contributes to CL-1148
2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407
Use bool for expanded or collapsed state
...
Contributes to CL-1148
2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none
...
Fix version upgrade returning none
2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28
Added an extra import module, did not pass coding style test
...
CURA-5936
2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a
Merge branch 'master' into fix_version_upgrade_returning_none
2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9
Fix type error for hovering manage queue link
...
Contributes to CL-1148
2018-11-22 11:09:35 +01:00
Jaime van Kessel
d4e4e50741
Fix typo
2018-11-22 10:55:53 +01:00
Marijn Deé
352427e460
Moved exception handling closer to the cause of error
2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091
Moved some of the mocks to class level because they are used in every test method
2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2
Reverted models to namedtuples from collections because
...
NamedTuple is a Python3.6 feature
2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af
Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints
2018-11-21 10:12:53 +01:00
ChrisTerBeke
8453cd693e
Make QNetworkReply optional
2018-11-21 00:04:34 +01:00
ChrisTerBeke
8ad8489af0
Fix returning reply on postFormWithParts
2018-11-21 00:03:36 +01:00
ChrisTerBeke
c7bb6931f4
Refactor networked output device
...
All networking related stuff is moved to a separate class called NetworkClient for reusability.
As example it is now also used in the WIP CloudOutputDeviceManager to clean up network calling there.
2018-11-20 23:44:28 +01:00
ChrisTerBeke
4e8979334e
Switch Ultimaker Account OAuth2 client
...
The new client has access to more permissions and is labeled as "Ultimaker Cura" instead of "Cura Backups Plugin".
Also removes `self._cloud_api_root` as that's not used anymore now that `self._oauth_root` is used for the redirect URLs.
2018-11-20 19:18:48 +01:00
ChrisTerBeke
07c9980d91
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
...
* tests-for-um3networkplugin:
Fix the title's top margin size in the add machine dialog.
Use generated Makefiles to run tests
Add option test-verbose build option to CuraTests
2018-11-20 18:59:53 +01:00
ChrisTerBeke
c1c3f3abf3
Merge branch 'master' into tests-for-um3networkplugin
...
* master:
Fix the title's top margin size in the add machine dialog.
Use generated Makefiles to run tests
Add option test-verbose build option to CuraTests
2018-11-20 18:59:31 +01:00
ChrisTerBeke
ff2d8b9076
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
...
* tests-for-um3networkplugin:
Fixed the failing tests
Made the tests work with the named tuples Tests only use the _onGetRemoteMaterial
Fixed some bugs and added the color_code field to the named tuple
2018-11-20 18:57:42 +01:00
Marijn Deé
f3338aa187
Fixed the failing tests
2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292
Made the tests work with the named tuples
...
Tests only use the _onGetRemoteMaterial
2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f
Fixed some bugs and added the color_code field to the named tuple
2018-11-20 16:33:52 +01:00
Ian Paschal
2f84339f5c
Finalize queue
...
Contributes to CL-1148
2018-11-20 15:58:09 +01:00
Ian Paschal
fb3cb67da0
Add printer configuration components
...
Contributes to CL-1148
2018-11-20 13:46:41 +01:00
Diego Prado Gesto
76f2aeb43c
Fix the title's top margin size in the add machine dialog.
2018-11-20 11:27:45 +01:00
Lipu Fei
e6d9ad31ab
Use generated Makefiles to run tests
2018-11-20 09:53:17 +01:00
