3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
17030 commits 307 branches 272 tags 787 MiB
Commit graph

4475 commits

Author SHA1 Message Date
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
Jaime van Kessel
1e5177a44f Added unit tests for authorization service 
CURA-5744
 2018-09-24 17:04:20 +02:00
Ghostkeeper
c46e0e7556
Only print message about excluded materials if there are any 
Otherwise the message is very strange (with double spaces and such) and unnecessary.
 2018-09-24 11:59:02 +02:00
Lipu Fei
fe8aa02e7c Fix a direct signal emission that causes max recursion error 
CURA-5682

A max recursion error will occur when the user creates a material on the
material management page. Too many signals get directly triggered and
some of them head back again and causes a max recursion error.
 2018-09-24 11:44:55 +02:00
Cherubim
c29d38361b
Fix initial start-up when providing model parameter 
If you're adding a model file as command line argument to Cura, it should auto-load this file upon start-up. However when adding this command line argument upon first launch of Cura, there is no printer yet so Cura would crash because it tries to load a model before there is a build volume. This prevents that crash and instead doesn't load the model at all.
 2018-09-23 00:27:50 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML 
This is done by adding the API as an SingletonType to Cura.

CURA-5744
 2018-09-21 17:23:30 +02:00
Jaime van Kessel
b54383e685 Added account object to API 
CURA-5744
 2018-09-21 16:43:32 +02:00
Jaime van Kessel
060ea0b762 Fixed up final bit of mypy issues 
CURA-5744
 2018-09-21 14:12:31 +02:00
Jaime van Kessel
d0fc4878c2 Fix number of mypy mistakes 
CURA-5744
 2018-09-21 13:54:37 +02:00
Ghostkeeper
b26c78202b
Consolidate log entries about excluded materials 
I got a log where 80% of the log was this particular message. Let's not do that.
 2018-09-21 13:11:12 +02:00
Lipu Fei
a80fde1495 Merge remote-tracking branch 'origin/3.5' 2018-09-21 12:11:18 +02:00
Lipu Fei
1bf78c086d Remove import plugins which is not a module 2018-09-21 12:03:15 +02:00
Jaime van Kessel
3ae223334f Removed relative imports 
Since the oauth module isn't just in a plugin anymore, there is no need for any of the relative imports

CURA-5744
 2018-09-21 12:02:11 +02:00
Jaime van Kessel
3830fa0fd9 Initial move of the code of CuraPluginOAuth2Module 
CURA-5744
 2018-09-21 11:58:30 +02:00
Diego Prado Gesto
8352fd1ae0 Merge branch '3.5' 2018-09-21 09:29:17 +02:00
Diego Prado Gesto
4bd5d29970 Don't crash if the plugin is not found (maybe some error while loading). 
In that case it's better not to show the dialog than crashing.
 2018-09-20 18:41:30 +02:00
Diego Prado Gesto
2d300ab395 Revert "Fix plugins import in CuraApplication" 
This reverts commit e87f3d7ca9.
 2018-09-20 18:34:08 +02:00
Ian Paschal
0e44a78251 Set non-NOTIFY properties to constants 2018-09-20 15:33:10 +02:00
Simon Edwards
9d53a31ec1 Add a missing file 
CL-897
 2018-09-20 10:28:41 +02:00
Ian Paschal
60ff8aa05f Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements 2018-09-20 10:18:00 +02:00
Simon Edwards
b7673a7438 Show Cura Connect alerts in the monitor tab 
CL-897
 2018-09-19 16:53:18 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Diego Prado Gesto
e28b662649 Clean up the code a bit and update comments. 
Contributes to CURA-5736.
 2018-09-18 16:04:31 +02:00
Lipu Fei
9924e3e26c Remove duplicated code 
CURA-5735
 2018-09-18 15:08:55 +02:00
Lipu Fei
ddc5d983a1 Fix single extrusion machines without an ExtruderStack 
CURA-5736
 2018-09-18 13:35:25 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
74fcc10f59 Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-17 12:11:00 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5' 2018-09-17 10:54:44 +02:00
Ghostkeeper
8a94042a1f
Fix icon name role 
The icons were not displaying in the context menu of the settings.
 2018-09-17 10:51:56 +02:00
Ghostkeeper
a870060a34
Remove unused parameter 2018-09-14 17:00:55 +02:00
Ghostkeeper
e9ac0e5564
Merge branch '3.5' 2018-09-14 12:41:35 +02:00
Ghostkeeper
fb9c21e914
Fix imports 2018-09-14 12:41:03 +02:00
Ghostkeeper
3b36223681
Merge branch '3.5' 2018-09-14 12:40:29 +02:00
Ghostkeeper
e9cdd47a03
Fix types of getGlobalContainerStack call results 
We know in these places that there must be a global stack at this point. So to hide the type error we'll cast it here.
Of course, the danger in this is that someone might call this function that doesn't know about this requirement and calls it when there is potentially no global stack yet. Hopefully they'll discover this crash when that happens then.
 2018-09-14 12:38:16 +02:00