ChrisTerBeke
74bec96ce8
Fix a relative import
2018-12-17 17:41:02 +01:00
ChrisTerBeke
12866c107b
Fix again
2018-12-17 17:39:48 +01:00
ChrisTerBeke
c75fa5de3d
Fix merge conflict
2018-12-17 17:39:30 +01:00
fieldOfView
7d6e698f43
Fix (USB) print monitor in dark theme
2018-12-17 17:37:21 +01:00
Jaime van Kessel
3f7c922734
Add missing type for g-code reader
2018-12-17 17:37:12 +01:00
Jaime van Kessel
a7c1a45d44
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 17:32:31 +01:00
Jaime van Kessel
0e294481ff
Improve readability of printer_type_label for dark theme
2018-12-17 17:32:11 +01:00
Diego Prado Gesto
62ac10d112
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 17:30:20 +01:00
Diego Prado Gesto
d6212d5a39
Add elide in the showcase title and reduce the height a bit so there are
...
only 2 lines for the title.
2018-12-17 17:29:24 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel
...
CL-1152 Add monitor carousel
2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be
Make hints clickable
...
Contributes to CL-1151
2018-12-17 16:58:51 +01:00
alekseisasin
4d135c13bb
Cura used wrong firmware version for UMO+. The firmware was from UMO.
...
The reason of this issue because it used a heated firmware from his
parent(UMO) printer. To avoid this case we need to define externally
the firmware_hbk_file property in umo+ defintion file
CURA-5994
2018-12-17 16:46:02 +01:00
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77
Merge branch '4.0' into CURA-6011_connection_types
2018-12-17 15:44:02 +01:00
Lipu Fei
1440c7d996
Merge pull request #5005 from Ultimaker/sdk_version_6
...
Increment API version to 6
2018-12-17 15:43:09 +01:00
ChrisTerBeke
ab85e4794b
Merge pull request #4994 from Ultimaker/STAR-322_cloud-connection-multipart-upload
...
STAR-322: Cloud connection resumable upload
2018-12-17 15:29:56 +01:00
Jaime van Kessel
06d9fd9dbe
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 15:26:36 +01:00
Jaime van Kessel
1352193654
Ensure that the sourceSize is set correctly
2018-12-17 15:26:10 +01:00
Jaime van Kessel
53da111617
Change "Rating" to "Your rating"
2018-12-17 15:21:48 +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
42ae9faeb4
STAR-322: Reverting change to run mypy
2018-12-17 14:42:16 +01:00
Daniel Schiavini
75d7d49349
STAR-322: Mocking the CuraApp
2018-12-17 14:41:28 +01:00
Ian Paschal
cb6e4ff2d1
Organize MonitorStage.qml better
2018-12-17 14:05:28 +01:00
Daniel Schiavini
3b367938de
STAR-322: Removing TestSendMaterialJob temporarily
2018-12-17 13:53:31 +01:00
Jaime van Kessel
aad7540366
Fix situation where multiple connect configurations would cause issues
...
CURA-6011
2018-12-17 13:31:38 +01:00
Daniel Schiavini
b6f90f1ab2
STAR-322: Using cura constants
2018-12-17 13:29:20 +01:00
Daniel Schiavini
a1cb09f73f
STAR-322: Sorting clusters
2018-12-17 13:24:07 +01:00
Daniel Schiavini
34f56b046a
STAR-322: Review comments
2018-12-17 13:13:44 +01:00
Jaime van Kessel
ee74b9f89f
Once the connectiontype is recovered, it's converted to a string
...
So we need to check if that's the case.
CURA-6011
2018-12-17 13:09:01 +01:00
Lipu Fei
6992fd2991
Update plugin versions to match package versions
...
CURA-6019
2018-12-17 13:03:21 +01:00
Daniel Schiavini
99d52692e3
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
2018-12-17 12:34:38 +01:00
ChrisTerBeke
02a2585ad1
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 12:33:15 +01:00
Diego Prado Gesto
9814deaeab
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 12:21:01 +01:00
Diego Prado Gesto
ab83af3a03
Fix code-style
2018-12-17 12:20:30 +01:00
Daniel Schiavini
87c1392173
STAR-322: Fixing tests
2018-12-17 12:05:25 +01:00
Daniel Schiavini
9eb743bcb8
STAR-322: Making mypy happy
2018-12-17 12:01:10 +01:00
Simon Edwards
81c0d7efc0
Merge pull request #5006 from Ultimaker/fix_um3_info_component_warnings
...
Fix UM3InfoComponents warnings
2018-12-17 11:59:25 +01:00
Ian Paschal
6178f9ddf6
Improve code style and line lengths
2018-12-17 11:49:09 +01:00
Daniel Schiavini
9f4b7bd703
STAR-322: Improving logging and cluster connection
2018-12-17 11:28:16 +01:00
Diego Prado Gesto
ed4d339dee
Change the margin in the view orientation buttons to aling the pixels correctly
2018-12-17 11:00:49 +01:00
Jaime van Kessel
938287095f
Use connection type instead of um_network_key to see if a printer has a network connection
...
CURA-6011
2018-12-17 10:47:14 +01:00
Diego Prado Gesto
ddf3c13b2a
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2018-12-17 10:43:53 +01:00
Diego Prado Gesto
cbd8e72bd5
Add fixed width to the preview button
...
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
2018-12-17 10:42:52 +01:00
Ian Paschal
ff1a0e30f6
Code style & comments
2018-12-17 10:42:41 +01:00
Daniel Schiavini
9086105204
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection-multipart-upload
2018-12-17 10:38:29 +01:00
Ghostkeeper
8d6a281070
Increment SDK version in bundled packages file
...
And increment the version number of every package.
Contributes to issue CURA-6019.
2018-12-17 09:58:38 +01:00
Ian Paschal
77deabf6d4
Code style
2018-12-17 09:43:24 +01:00
ChrisTerBeke
d900648f99
Merge branch '4.0' into STAR-322_cloud-connection
2018-12-17 09:28:22 +01:00
