3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18104 commits 313 branches 275 tags 719 MiB
Commit graph

18104 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Paschal
f3d0010b87 Add cloud connection condition 
Contributes to CL-1165
 2019-01-17 15:44:37 +01:00
Ian Paschal
495115c9f7 Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-17 15:11:38 +01:00
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests" 
This reverts commit 665c331564.
 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
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
12a120f044 Slightly modify the variant label to match more with the monitor tab 
CURA-6100
 2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
Jaime van Kessel
900e0183ca Merge branch 'CURA-6117_remove_hardcoded_account_urls' of github.com:Ultimaker/Cura into 4.0 2019-01-17 13:16:12 +01:00
Jaime van Kessel
665c331564 Added skip mark to failing cloud tests 2019-01-17 13:04:04 +01:00
Daniel Schiavini
2b27c8c1a9 Revert incorrect change to run_mypy 2019-01-17 13:00:42 +01:00
Daniel Schiavini
badb0b0ca9 Use patch.object to allow relative imports 
Issue STAR-322.
 2019-01-17 12:58:23 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs 
CURA-6117
 2019-01-17 11:20:21 +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
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
Ian Paschal
5ed7f6f6ce
Merge pull request #4926 from Ultimaker/STAR-322_cloud-connection 
[4.0] STAR-322: Cloud connection
 2019-01-16 10:20:01 +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
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
Diego Prado Gesto
26564363d7 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-15 12:15:34 +01:00
Jaime van Kessel
d4b47c75ab Fix typo in multiply message 2019-01-15 11:15:37 +01:00
ChrisTerBeke
ed96d32aca trigger re-build 2019-01-15 09:59:17 +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 7785555a94.
 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
Diego Prado Gesto
fa7b38243c Add VersionUpgrade35to40 as a bundled package 
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
 2019-01-14 17:02:02 +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
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0 2019-01-14 14:12: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
71036abd87 Add troubleshooting link for recommended 
CURA-6114
 2019-01-14 12:11:45 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
Lipu Fei
0ecd00fa1f
Merge pull request #5150 from Ultimaker/CURA-6054-2_fix_resize_panel_on_window_change 
Fix resizable Settings-Panel for change in window size. [CURA-6054]
 2019-01-14 11:01:46 +01:00
ChrisTerBeke
402097f4d0 Fix imports 2019-01-14 10:57:50 +01:00
Lipu Fei
29bb317293 Add a margin to settings panel bottom 
CURA-6054
 2019-01-14 10:55:03 +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
fieldOfView
f8bfca6079 Don't show auto configuration selection when there are no configurations 2019-01-11 18:27:44 +01:00
fieldOfView
d03ec22dee Hide empty abbreviated machinename 
Connected printers that are not Cura Connect printers may not have a connect_group_name.
 2019-01-11 17:55:06 +01:00
fieldOfView
c6fa47e584 Mark PrinterOutputDevice without printer type as invalid 
Since self._printer_type was defined as an empty string and the setter only accepts strings, it could never be None
 2019-01-11 17:52:28 +01:00
fieldOfView
c81689d233 Prevent a recurring qml warning 
Note that the connect_group metadata is also queried for non-connected printers; the model is not filtered, but non-connected printers are set to be invisible.
 2019-01-11 17:40:36 +01:00
Remco Burema
7b3cf6be64 Fix resizable Settings-Panel for change in window size. [CURA-6054] 2019-01-11 17:32:15 +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