Ghostkeeper
a01063b7d8
Merge branch '4.0'
2019-01-17 16:32:18 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
...
Remove loading gif
2019-01-17 16:17:00 +01:00
Jaime van Kessel
662dd80a1d
Add logging if the status code of toolbox request is not 200
2019-01-17 16:06:10 +01:00
Jaime van Kessel
2cd6f6a834
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 14:44:42 +01:00
Jaime van Kessel
894dbcf6f6
Revert "Added skip mark to failing cloud tests"
...
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0
2019-01-17 14:42:56 +01:00
Jaime van Kessel
94cf61ca18
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 14:28:35 +01:00
Jaime van Kessel
aff2ffc67a
Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0
2019-01-17 14:23:06 +01:00
Jaime van Kessel
15563a756f
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe
Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura
2019-01-17 13:12:41 +01:00
Jaime van Kessel
665c331564
Added skip mark to failing cloud tests
2019-01-17 13:04:04 +01:00
Daniel Schiavini
badb0b0ca9
Use patch.object to allow relative imports
...
Issue STAR-322.
2019-01-17 12:58:23 +01:00
ChrisTerBeke
b51317b4f3
Merge branch '4.0' of https://github.com/Ultimaker/Cura into 4.0
2019-01-17 10:23:38 +01:00
ChrisTerBeke
aab1fbc73f
Try other patch values for relative imports
2019-01-17 10:22:37 +01:00
Jaime van Kessel
909c74c9b6
Fix the tests so they don't rely on external URL
2019-01-17 09:56:46 +01:00
Jaime van Kessel
f5c4b6919d
Merge branch 'master' of github.com:Ultimaker/Cura into unittests_firmwareupdate_0
2019-01-17 09:49:48 +01:00
Jaime van Kessel
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-16 17:39:43 +01:00
Diego Prado Gesto
c28aefac4e
Add the maximum backups message to the backups plugin
...
It didn't work after previous changes, so now it will show again when the user already has 5 backups.
Contributes to CURA-6005
2019-01-16 17:33:14 +01:00
ChrisTerBeke
d9a8bb0eb7
Remove empty init py in plugins dir
2019-01-16 15:18:04 +01:00
Ghostkeeper
1b7b302f42
Fix some typos
2019-01-15 17:31:51 +01:00
Remco Burema
f057c9a7df
Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match.
2019-01-15 17:15:12 +01:00
ChrisTerBeke
a702661b5d
Decrease the API call intervals to get quicker UI updates
2019-01-15 14:17:38 +01:00
ChrisTerBeke
3d6710d5b6
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-15 13:08:54 +01:00
Lipu Fei
ea0a6827ff
Merge remote-tracking branch 'origin/4.0'
2019-01-15 12:22:46 +01:00
Lipu Fei
c991741a45
Merge pull request #5167 from Ultimaker/CURA-6087-Allow-multiple-sdk-versions-for-plugins
...
Ensure that the toolbox correctly handles multiple supported SDK vers…
2019-01-15 12:20:18 +01:00
Lipu Fei
d8850f4946
Fix version upgrade 40 to 41 to set setting_version 7
...
CURA-6113
2019-01-15 11:36:10 +01:00
ChrisTerBeke
b7fb969524
Fixes for review
2019-01-15 09:37:38 +01:00
ChrisTerBeke
de24c7d9c3
Revert "Remove mock changes used locally"
...
This reverts commit 7785555a943b600636809ae5c5e50cabecdd79fd.
2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94
Remove mock changes used locally
2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f
Fix tests
2019-01-15 08:20:39 +01:00
ChrisTerBeke
f478653c37
Uncomment code that was needed for testing
2019-01-14 14:56:14 +01:00
ChrisTerBeke
7bf319dfd1
Better fix for circular dependency
2019-01-14 14:17:36 +01:00
Jaime van Kessel
9d94b55596
Ensure that the toolbox correctly handles multiple supported SDK versions
...
CURA-6087
2019-01-14 13:35:10 +01:00
Lipu Fei
b2dace2d48
Fix version upgrade
...
CURA-6113
2019-01-14 11:25:02 +01:00
ChrisTerBeke
cd19eec98a
Remove weird argument for timer
2019-01-14 11:06:16 +01:00
ChrisTerBeke
402097f4d0
Fix imports
2019-01-14 10:57:50 +01:00
ChrisTerBeke
1e2a8aa23e
revert to prevent circular dependency
2019-01-14 10:52:50 +01:00
ChrisTerBeke
13d390a7d9
Fix imports in tests, some cleanup
2019-01-14 10:43:32 +01:00
ChrisTerBeke
81abc84741
Fix typing of CloudOutputDevice in controller
2019-01-14 10:41:10 +01:00
Diego Prado Gesto
c6da824203
Merge branch '4.0'
2019-01-14 08:56:33 +01:00
Diego Prado Gesto
c11e0cecc8
Remove loading gif
...
Instead of an external gif, use the BusyIndicator that exists in the ActionButton.
2019-01-13 16:58:38 +01:00
ChrisTerBeke
50b82e828b
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-11 17:20:39 +01:00
Diego Prado Gesto
801a43c874
Add a small margin in the right so the close button is never behind the scrollbar
...
Contributes to CURA-6005.
2019-01-11 17:04:51 +01:00
ChrisTerBeke
7bbd43928a
Fix more review comments
2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de
Fixed all codestyle and nitpicks from review
2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a
Use toolpath instead of mesh, some review fixes
2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a
Solve some review comments
2019-01-11 16:14:55 +01:00
ChrisTerBeke
2e3398e349
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-11 15:10:44 +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
