Nino van Hooff
de82406782
Convert doxygen to rst for UltimakerMachineActions, USBPrinting
2020-05-15 14:00:44 +02:00
Nino van Hooff
d96359f208
Convert doxygen to rst for Toolbox, TrimeshReader
2020-05-15 13:53:10 +02:00
Nino van Hooff
8e347c1034
Merge remote-tracking branch 'origin/doxygen_to_restructuredtext_comments' into doxygen_to_restructuredtext_comments
...
# Conflicts:
# cura/OAuth2/AuthorizationService.py
2020-05-15 13:40:22 +02:00
Nino van Hooff
c6e6c76962
Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
...
# Conflicts:
# cura/API/Account.py
# plugins/SimulationView/SimulationView.py
2020-05-15 13:38:37 +02:00
Nino van Hooff
58e43c0a07
Convert doxygen to rst for SentryLogger, SimulationView, SliceInfo,
...
SolidView
2020-05-15 13:34:58 +02:00
Ghostkeeper
783b26e521
While searching, search through all settings rather than just visible
...
This makes it consistent with the searching of the normal settings list. It also makes it easier to find certain things like the Cutting Mesh or something.
2020-05-15 13:11:28 +02:00
Nino van Hooff
94f094380b
Log sync state transitions
...
CURA-7290
2020-05-15 11:59:22 +02:00
Nino van Hooff
9acf8b6122
Revert "Add a sync timeout to CloudOutputDeviceManager"
...
Stopgap solution is not necessary anymore after CloudOutputDeviceManager
after implementing timeouts on the http-level.
This reverts commit 15f813a4
2020-05-15 11:32:49 +02:00
Nino van Hooff
f3c66c3189
Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager
...
Has the benefit of a more unified Http request management + timeouts
CURA-7290
2020-05-15 11:28:17 +02:00
maukcc
39595d0541
HMS434 update
2020-05-15 09:28:07 +02:00
maukcc
80a886f582
HMS434 upgrade
...
Added host chamber fan support
2020-05-15 09:24:17 +02:00
grk3010
885fe32fb0
Update smoothie.def.json
...
remove depreciated "category"
2020-05-14 16:15:12 -04:00
grk3010
3d412e53b7
Make Smoothie definition Generic
...
Remove quality, extruder, and nozzle profiles to make the smoothie machine definition a generic custom configuration.
2020-05-14 16:05:27 -04:00
Ghostkeeper
5a8d411c35
Fix upgrading quality-changes profiles per extruder
...
These have a slightly different syntax apparently.
I thought I tested this before. But apparently not well enough.
Contributes to issue CURA-7433.
2020-05-14 16:44:48 +02:00
Nino van Hooff
15f813a4ff
Add a sync timeout to CloudOutputDeviceManager
...
Fixes an issue where printer syncing breaks when switching networks etc.
CURA-7290
2020-05-14 15:47:45 +02:00
Nino van Hooff
a9692e3d27
Refactor setManualSyncEnabled
...
CURA-7290
2020-05-14 15:15:16 +02:00
Nino van Hooff
a3f968188f
Add timeout to CloudPackageChecker request
...
Prevents it from getting stuck in the SYNCING state
CURA-7290
2020-05-14 15:14:51 +02:00
Nino van Hooff
b6b6a39989
Fix QML typo
...
CURA-7290
2020-05-14 15:13:57 +02:00
fieldOfView
321693d410
Add upgrade script to update instances of removed scripts to unified script
2020-05-14 11:38:30 +02:00
fieldOfView
172e6a0759
Merge branch 'master' into feature_unify_pause_at_height
...
# Conflicts:
# plugins/PostProcessingPlugin/scripts/BQ_PauseAtHeight.py
2020-05-14 08:45:38 +02:00
Nino van Hooff
e6639eb8eb
Do not reserve height for manual sync button
...
CURA-7290
2020-05-13 17:36:24 +02:00
Nino van Hooff
59b40c72f0
Additional scenarios for enabling/disabling the manual sync button
...
CURA-7290
2020-05-13 17:32:57 +02:00
Ghostkeeper
1111041a5b
Merge branch 'CURA-7433_deltacomb_move_upgrades'
2020-05-13 17:27:16 +02:00
Ghostkeeper
984836c1af
Code style: Spaces around binary operators
...
Contributes to issue CURA-7433.
2020-05-13 17:25:09 +02:00
Nino van Hooff
f78fa884c1
Only show the manual sync button after the account popup was closed
...
CURA-7290
2020-05-13 17:19:20 +02:00
Nino van Hooff
72657f15be
Add padding to checked icon
...
CURA-7290
2020-05-13 16:38:42 +02:00
Nino van Hooff
6caa0360b9
Change SyncRow copy
...
CURA-7290
2020-05-13 16:35:39 +02:00
Nino van Hooff
de0ef8ae62
Change account sync date format to mm/dd/YYYY
...
CURA-7290
2020-05-13 16:15:29 +02:00
Nino van Hooff
97d1c3200b
Remove unused aliases from SyncState.qml
...
CURA-7290
2020-05-13 16:14:21 +02:00
Nino van Hooff
69a4be601b
Merge remote-tracking branch 'origin/master'
2020-05-13 11:39:16 +02:00
Jaime van Kessel
580bd13a76
Prevent crash if icon was not found
...
Fixes CURA-A2
2020-05-13 11:16:26 +02:00
Jaime van Kessel
384f92a516
Prevent crashes when loading objects before initialization is done
...
Fixes CURA-7J
2020-05-13 11:12:11 +02:00
Jaime van Kessel
8aabf113d2
Catch mouse events in toolpanel
...
Fixes #7720
2020-05-13 10:53:03 +02:00
sm3dp
85ca395f3f
sc60 extruders name
2020-05-13 13:45:59 +08:00
sm3dp
218d789cdb
change sc60 extruder left name
2020-05-13 11:02:06 +08:00
Remco Burema
6bb3c03739
Appease the tests!
...
CURA-7433
2020-05-12 18:59:10 +02:00
Remco Burema
3af8c20ccf
Deltacomb upgrade: Fix deepcopy not working for ConfigParser.
...
No idea why it worked on ghostkeepers' system. It isn't supposed to: https://bugs.python.org/issue16058
CURA-7433
2020-05-12 18:42:06 +02:00
Remco Burema
44900fad5a
Deltacomb upgrade: Fix leftover issues from last master-merge.
...
CURA-7433
2020-05-12 18:39:27 +02:00
Nino van Hooff
f34e05ac03
Merge pull request #7743 from Ultimaker/CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers
...
Cura 7427 add option to sign in with different account while waiting for printers
2020-05-12 17:39:07 +02:00
Kostas Karmas
eac4d3e463
Make login parametrized with a force_logout boolean
...
Instead of using a separate function to force logging out before
login, login now has a boolean parameter that instructs it to logout
before loging in again, if the user is alread logged in. It then
starts the authorization with a force browser logout first.
CURA-7427
2020-05-12 16:54:41 +02:00
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master
2020-05-12 16:41:05 +02:00
Jaime van Kessel
36cdf2edbe
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura
2020-05-12 16:25:39 +02:00
Peter Felecan
77b3476aae
Removed old "category" attribute
2020-05-12 15:53:21 +02:00
Nino van Hooff
37992e25de
Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync
...
# Conflicts:
# plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
2020-05-12 15:44:36 +02:00
maukcc
1afd8cd754
HMS434 update
2020-05-12 15:44:22 +02:00
Nino van Hooff
fbc0be30ec
Fix typing issue in CloudPackageChecker
...
CURA-7290
2020-05-12 15:40:53 +02:00
Jaime van Kessel
2cc6b7c54d
Appease mypy
2020-05-12 15:12:28 +02:00
Jaime van Kessel
de957ae5ec
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura into CURA-7290_manual_account_sync
2020-05-12 15:09:57 +02:00
Nino van Hooff
b40b8e8489
Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
...
# Conflicts:
# cura/API/Account.py
2020-05-12 14:59:01 +02:00
Nino van Hooff
3ca703f00c
Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync
2020-05-12 14:19:51 +02:00
