ChrisTerBeke
36e49ee6bb
Make activeMachineIsGroup more robust
2019-01-11 16:08:46 +01:00
ChrisTerBeke
b78ac0664f
Fix return types from review
2019-01-11 16:07:08 +01:00
ChrisTerBeke
2e3398e349
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-11 15:10:44 +01:00
Jaime van Kessel
3ecdd91223
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-11 14:49:06 +01:00
Jaime van Kessel
cbeadb2343
Set the font of the time estimation to medium bold
...
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.
CURA-6097
2019-01-11 14:47:59 +01:00
Diego Prado Gesto
eaf4fefe00
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-11 14:46:47 +01:00
Diego Prado Gesto
e706020639
Improve the text when there is no configuration available
...
It can happen that the list is empty because the data is still coming or because the connection has been lost.
There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.
Contributes to CURA-6011.
2019-01-11 14:44:49 +01:00
Jaime van Kessel
2dead87593
Ensure that the installed & canUpdate properties get set correctly
...
CURA-6053
2019-01-11 14:43:56 +01:00
Jaime van Kessel
d4621ec504
Ensure that if no CuraCloudApiRoot is set that the default is used
...
CURA-6005
2019-01-11 13:20:14 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models
...
Star-347: Update Cura Connect models
2019-01-10 17:46:26 +01:00
Jaime van Kessel
ff79e91686
Move the additional components for the save button out of the action panel
...
CURA-6097
2019-01-10 16:32:43 +01:00
Jaime van Kessel
614b1000fd
Added missing material compatibility chart link
...
CURA-6090
2019-01-10 15:36:36 +01:00
ChrisTerBeke
36191fbe0f
Fix typevar typing issue
2019-01-10 15:36:12 +01:00
ChrisTerBeke
56f0a341bc
Fix merge conflicts
2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
...
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
2019-01-10 14:58:00 +01:00
Remco Burema
a042de128b
Tag CuraCloudAPIVersion-string-value as expression instead of literal. [CURA-6005]
2019-01-10 14:16:20 +01:00
Diego Prado Gesto
03b4121d22
Fix broken shortcut for slice or stop slicing.
2019-01-10 13:59:22 +01:00
ChrisTerBeke
764769f4bb
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-10 09:48:48 +01:00
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade
...
Add version upgrade for 4.0
2019-01-09 17:42:17 +01:00
Ian Paschal
8831ba04e1
Fix missing extruder number
2019-01-09 17:05:10 +01:00
ChrisTerBeke
8813f10331
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-09 13:34:11 +01:00
Jaime van Kessel
366d2c8114
Prevent crash for firmware updater if the activePrinter is not set
2019-01-09 12:56:49 +01:00
Jaime van Kessel
d928e0979d
Handle attempting to remove a favorite material that was already removed
2019-01-09 12:54:33 +01:00
Jaime van Kessel
e718bed151
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-09 12:51:53 +01:00
Jaime van Kessel
862c76a2ea
Check if the optimised layer data is stored before attempting to delete it
2019-01-09 12:51:20 +01:00
ChrisTerBeke
edf64bef85
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-09 10:45:49 +01:00
Lipu Fei
580a69f11e
Add CuraCloudAccountAPIRoot to CuraVersion.py.in
...
CURA-6005
2019-01-09 09:27:34 +01:00
Lipu Fei
520b34ab89
Use getPluginPath()
...
CURA-6005
2019-01-09 08:41:15 +01:00
Simon Edwards
0de84dad13
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab
...
CL-1157 Add skeleton loading to the monitor tab
2019-01-08 16:23:16 +01:00
Lipu Fei
aee4034e3e
No caching preferences
...
CURA-6005
2019-01-08 15:49:36 +01:00
Ian Paschal
97e17d9fb8
Remove debug behavior
...
Contributes to CL-1157
2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe
Add skeleton loading to print job queue
...
Contributes to CL-1157
2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296
Add skeleton loading to printer cards
...
Contributes to CL-1157
2019-01-08 14:27:54 +01:00
Lipu Fei
a8fe5ced89
Remove unused import
...
CURA-6005
2019-01-08 13:33:49 +01:00
Lipu Fei
53cb2ce189
Add comments for http status >=300 check
...
CURA-6005
2019-01-08 13:29:48 +01:00
ChrisTerBeke
32415f4d8e
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-08 13:19:36 +01:00
ChrisTerBeke
b8da720c1d
Move translations in-line
2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522
Fix some review comments
2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7
Fix renamed property connectionType
2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4
Fix merge conflicts with 4.0
2019-01-08 11:49:36 +01:00
Jaime van Kessel
a25ae4ee07
Merge branch 'CURA-6085_fix_font_sizes' of github.com:Ultimaker/Cura into 4.0
2019-01-08 11:44:49 +01:00
Lipu Fei
4cb853cdb0
Fix (bigger) fonts for Chinese and Japanese
...
CURA-6085
2019-01-08 10:51:30 +01:00
Jaime van Kessel
578027182e
Prevent setting items from overlapping with column headers
2019-01-08 10:49:55 +01:00
Lipu Fei
2124de3d4d
Revert "Chnage default font sizes and unify font weights"
...
This reverts commit af634b82b25fdd765a134288b101588ed2fdc22c.
CURA-6085
2019-01-08 10:45:52 +01:00
Lipu Fei
8e898148f6
Make checkboxes and texts more aligned
...
CURA-6085
2019-01-08 09:42:52 +01:00
Lipu Fei
af634b82b2
Chnage default font sizes and unify font weights
...
CURA-6085
2019-01-08 09:39:50 +01:00
Ian Paschal
4dbab88792
Add dummy printer for loading
2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce
Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab
2019-01-07 13:38:23 +01:00
Lipu Fei
a43900b0ad
Fix version upgrade for XMLMaterialProfile
...
CURA-5995
2019-01-07 11:17:12 +01:00
Lipu Fei
059fede06e
Mkae default custom settings panel height smaller
...
CURA-6054
2019-01-07 10:53:21 +01:00
