GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,772 Commits 291 Branches 265 Tags
Commit Graph

23772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nino van Hooff
903c251f34 Additional account sync documentation 
CURA-7290
 2020-05-12 14:19:36 +02:00
Kostas Karmas
898ca852f0 Fix mypy complaint about Optional type 
CURA-7427
 2020-05-12 13:40:27 +02:00
maukcc
70fa227274 HMS434 update 2020-05-12 13:32:55 +02:00
Jaime van Kessel
6af502088e
Fix typing issue 
CURA-7290
 2020-05-12 13:25:36 +02:00
Ghostkeeper
a2f509c255
Merge branch 'Add_test_for_maximum_platform_mesh_size' 2020-05-12 13:20:55 +02:00
Kostas Karmas
32efb8d7bb Fix description comment of _generate_auth_url() 
CURA-7427
 2020-05-12 13:17:18 +02:00
Kostas Karmas
f6ebac6e34 Merge branch 'master' into CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers 2020-05-12 13:10:41 +02:00
Kostas Karmas
d3fb002d9b Transfer the generation of the auth link into its own function 
The authentication link should be prepended with a logoff link from
mycloud, if it is requested. In order to make this process testable
this commit separates the generation of the authentication link,
based on whether it requests for a browser logoff first, into its
own function.

This commit also adds tests for this function.

CURA-7427
 2020-05-12 13:07:39 +02:00
Kostas Karmas
96387ef2aa Add tests for loginWithForcedLogout() in account 
CURA-7427
 2020-05-12 13:06:47 +02:00
Kostas Karmas
e3e767f4b9 Simplify the link in AddNetworkOrLocalPrinterContent 
CURA-7427
 2020-05-12 12:23:42 +02:00
Nino van Hooff
3e1b695c43 Add some missing account sync timer logic 
CURA-7290
 2020-05-12 11:55:50 +02:00
Nino van Hooff
8e75da552d Do not inherit SyncState from QObject 
not necessary and fixes mypy warning

CURA-7290
 2020-05-12 11:23:14 +02:00
Psych0meter
9976889e5e
Leapfrog Creatr HS / XL Integration (#7723) 
Add the leapfrog creatr HS and leapfrog creatr XL
 2020-05-12 11:13:51 +02:00
Jaime van Kessel
d5194cbec6
Merge branch 'mb-fix-es-overhang-shader' of https://github.com/smartavionics/Cura 2020-05-12 11:02:21 +02:00
Jaime van Kessel
897ed099f4
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-12 11:00:24 +02:00
maukcc
598a32eb1e HMS434 update 
set pid depending on nozzle temp
set chamberfans according to temp
 2020-05-12 10:34:29 +02:00
Kaleidoscopeit
dcd125ed7c Update setting versions to 15 + cutting edge improvements to Deltacomb profiles 2020-05-12 01:03:36 +02:00
Ghostkeeper
89fc4c94bf
Add version upgrade for changed Redo Layer parameter of Pause script 
This was changed from a number of layers to just a boolean for 1 or 0 layers.

Contributes to issue CURA-7413.
 2020-05-11 18:50:49 +02:00
Ghostkeeper
aff28d821f
Also reset extrusion for Griffin printers 
The rest may not be necessary but the G92 is crucial if redo layer is activated.

Contributes to issue CURA-7413.
 2020-05-11 18:35:27 +02:00
Ghostkeeper
05b0bf5988
Turn 'Redo Layers' into a boolean for at most 1 layer 
We've deemed it irresponsible to redo multiple layers. This will dig the nozzle back down into the layers that were printed before the pause.

This doesn't include a version upgrade yet.

Contributes to issue CURA-7413.
 2020-05-11 18:34:41 +02:00
Kostas Karmas
b717755f20 Add "Sign in with another account" button in AddCloudPrintersView 
There are cases where Cura and the browser fall out of sync when it
comes to accounts. In such cases, you may be logged in cura with an
account that has no cloud printers and in the browser with an account
that has printers. So when you press the "Add cloud printer" button,
you are redirected to mycloud and you see cloud printers that are not
detected by Cura (because Cura is in a different acconut). In such
cases, the user can now press the "Sign in with a different account"
link in the "Waiting for cloud response" page, which will log him/her
out in Cura AND in the browser, and then reinitiate the whole
authorization flow, to make sure the accounts are in sync.

CURA-7427
 2020-05-11 17:47:09 +02:00