3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18156 commits 313 branches 275 tags 718 MiB
Commit graph

18156 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
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
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
15563a756f Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 13:42:58 +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
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
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
2aa985c6de Update all profiles to setting_version 7 
CURA-6113
 2019-01-17 11:49:26 +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
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
2f43339434 Merge branch 'CURA-6118_add_experimental_tag_on_stage_panel' of github.com:Ultimaker/Cura 2019-01-17 09:32:29 +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
Remco Burema
a0dd3f06e6 Add 'Experimental' tag for quality profiles in the header. 
When an experimental quality profile is active, the stage panel does not show that it is experimental.
It is however shown on the quality drop-down menu in Custom mode.

This commit also fixes the untranslated (hardcoded) 'Experimental' string in the dropdown in Custom.

Fixes the issue reported in CURA-6118.
 2019-01-16 15:50:40 +01:00
Jaime van Kessel
7c7f6a1f03 Ensure sane defaults for the ApplicationMetada when making builds 2019-01-16 15:28:16 +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
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
Diego Prado Gesto
26564363d7 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-15 12:15:34 +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
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
f16735a5be Add VersionUpgrade40to41 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:10:52 +01:00
Diego Prado Gesto
bf20e04b0d Merge branch '4.0' 2019-01-14 17:03:12 +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
Jaime van Kessel
090fdbf598 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-14 14:17:40 +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