Ghostkeeper
|
3e7021d729
|
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
|
2018-09-28 13:48:14 +02:00 |
|
fieldOfView
|
9af71f2888
|
Fix incorrect typing and issues caused by typing
|
2018-09-28 13:40:39 +02:00 |
|
Ghostkeeper
|
bfc3c5d8d8
|
Merge branch 'feature_mesh_names' of https://github.com/paukstelis/Cura into paukstelis-feature_mesh_names
|
2018-09-28 13:26:15 +02:00 |
|
fieldOfView
|
09742f0cf5
|
Simplify code
|
2018-09-28 13:09:59 +02:00 |
|
Remco Burema
|
a68a591c18
|
Correct typo leading to infinite recursion.
|
2018-09-28 13:07:18 +02:00 |
|
fieldOfView
|
a573a598b0
|
Add typing and appease MYPY
|
2018-09-28 12:40:44 +02:00 |
|
Lipu Fei
|
6e2f7e72b6
|
Fix missing argument
|
2018-09-28 12:34:00 +02:00 |
|
Lipu Fei
|
3a01b63343
|
Fix refactor and tests
|
2018-09-28 12:33:16 +02:00 |
|
Lipu Fei
|
6e46772170
|
Fix imports in Backup
|
2018-09-28 12:25:03 +02:00 |
|
Lipu Fei
|
dd150bbab9
|
Resolve circular imports for CuraAPI
|
2018-09-28 12:07:00 +02:00 |
|
Ghostkeeper
|
4a4b096052
|
Only send uppercase g-code via custom commands
Because most printers don't understand anything other than uppercase.
Fixes #4178.
|
2018-09-28 11:53:28 +02:00 |
|
fieldOfView
|
a12c0e8d9e
|
Remove superfluous import
|
2018-09-28 11:51:33 +02:00 |
|
fieldOfView
|
bc52830c89
|
Move getDefaultFirmwareName() into GlobalStack
|
2018-09-28 11:49:00 +02:00 |
|
fieldOfView
|
9a98341bda
|
Fix code-style and typing
|
2018-09-28 11:38:42 +02:00 |
|
fieldOfView
|
7c23a4e187
|
Merge branch 'master' into feature_firmware_updater
|
2018-09-28 11:32:28 +02:00 |
|
Aleksei S
|
9bd4ab2faa
|
Added unittest for PrintInformation class
|
2018-09-28 10:46:14 +02:00 |
|
Jaime van Kessel
|
3b70e5eb6b
|
Fix typing
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
|
2018-09-27 20:01:55 +02:00 |
|
Jaime van Kessel
|
57334dd751
|
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
|
2018-09-27 17:52:00 +02:00 |
|
Jaime van Kessel
|
f585afe77b
|
Fix spacing
|
2018-09-27 17:31:45 +02:00 |
|
Jaime van Kessel
|
7310a677ce
|
Clean up more code
This fixes some typing and moves a property to protected, as it should be
|
2018-09-27 16:07:18 +02:00 |
|
Jaime van Kessel
|
c15f8aa693
|
Move printer type checking to where it belongs; inside the UM3 plugin.
|
2018-09-27 15:54:23 +02:00 |
|
Jaime van Kessel
|
889035ebfa
|
Fixed typo
|
2018-09-27 15:42:12 +02:00 |
|
Jaime van Kessel
|
d7901907af
|
Fix typing
|
2018-09-27 15:37:08 +02:00 |
|
Jaime van Kessel
|
b58c01400b
|
Updated typing & documentation
|
2018-09-27 15:28:53 +02:00 |
|
Jaime van Kessel
|
1467e703ae
|
No longer make BuildVolume set max bounds.
We didn't use it anymore and it added an extra requirement for buildvolume to depend on Application
|
2018-09-27 15:16:46 +02:00 |
|
Jaime van Kessel
|
d83241f13a
|
Add missing typing to number of decorators
|
2018-09-27 14:29:09 +02:00 |
|
Jaime van Kessel
|
853ccbdb71
|
Fix mypy typing issue
|
2018-09-27 14:00:28 +02:00 |
|
Jaime van Kessel
|
8d9a1fb85d
|
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
|
2018-09-27 13:47:32 +02:00 |
|
Jaime van Kessel
|
f8369703ed
|
Connect signals before loading auth data
CURA-5744
|
2018-09-27 13:45:46 +02:00 |
|
ChrisTerBeke
|
6d402806ac
|
Ensure logged in state is not always set to False after loading from preferences
|
2018-09-27 13:35:18 +02:00 |
|
Jaime van Kessel
|
202cf698c3
|
Change callback for succes / failure to the new location
CURA-5744
|
2018-09-27 11:56:19 +02:00 |
|
Lipu Fei
|
329b38663e
|
Fix code style
|
2018-09-27 11:44:10 +02:00 |
|
Lipu Fei
|
b1198ee1b8
|
Remove an if-else block that assumes no ExtruderStack
There is always an ExtruderStack, so the else-block will never be
executed.
|
2018-09-27 11:44:10 +02:00 |
|
Jaime van Kessel
|
649f1c8961
|
Make it optional for the AuthService to have a preference object
This should make it easier if we ever want to re-use the authService, since
it no longer has a hard link with the Preferences
CURA-5744
|
2018-09-27 11:42:12 +02:00 |
|
Jaime van Kessel
|
0ccbabd857
|
Switch SHA512 implementation to use the one from hashlib
CURA-5744
|
2018-09-27 11:37:44 +02:00 |
|
Jaime van Kessel
|
506ec5109d
|
Moved loading of the authentication to the account
CURA-5744
|
2018-09-27 11:37:22 +02:00 |
|
Jaime van Kessel
|
cf6d3b9289
|
Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login
|
2018-09-27 11:11:54 +02:00 |
|
Jaime van Kessel
|
1c8804ff2c
|
Changed documentation style to doxygen
CURA-5744
|
2018-09-27 11:03:17 +02:00 |
|
ChrisTerBeke
|
246d12a596
|
Remove client.package.download scope until that is deployed on production
|
2018-09-27 10:48:22 +02:00 |
|
ChrisTerBeke
|
52ffe39c07
|
Small fixes in settings
|
2018-09-27 10:33:50 +02:00 |
|
ChrisTerBeke
|
185a1707b2
|
Merge branch 'master' into CURA-5744-move-oauth-login
|
2018-09-27 09:40:44 +02:00 |
|
Jaime van Kessel
|
16ff1c3712
|
Add property for the accessToken
CURA-5744
|
2018-09-26 17:12:00 +02:00 |
|
Jaime van Kessel
|
067e59a254
|
Add logged_in as argument to loginStateChanged callback
CURA-5744
|
2018-09-26 17:06:09 +02:00 |
|
Lipu Fei
|
3c8368827b
|
Remove unused functions in ExtruderManager
|
2018-09-26 17:04:15 +02:00 |
|
Lipu Fei
|
7a681a2ae4
|
Move Cura custom setting functions to a separate file
|
2018-09-26 16:54:00 +02:00 |
|
Lipu Fei
|
91bcfb9445
|
Take in account extruders that haven't been loaded yet
CURA-5751
|
2018-09-25 15:29:31 +02:00 |
|
Diego Prado Gesto
|
e31f35ec95
|
Merge branch '3.5'
|
2018-09-25 09:36:08 +02:00 |
|
Jaime van Kessel
|
b48adf5b3e
|
Typing fixes
CURA-5744
|
2018-09-24 17:37:06 +02:00 |
|
Jaime van Kessel
|
f16a9c62b5
|
Fix typo
CL-5744
|
2018-09-24 17:28:19 +02:00 |
|
Jaime van Kessel
|
fe85c020b1
|
Fixed incorrect OAuth2 settings
CURA-5744
|
2018-09-24 17:12:45 +02:00 |
|