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
15911 commits 313 branches 275 tags 718 MiB
Commit graph

15911 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d5dbf91a4f Switch unit test to use decoratior instead of with waterfall 
CURA-5744
 2018-09-26 17:23:36 +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
Ghostkeeper
3127108d00
Only set top/bottom pattern to concentric for initial layer 
I'm taking responsibility for this. I'm changing it as a reaction to #4167 since I think concentric is good for the first layer but not so good for the rest of the layers. That user seems to agree but it hasn't been tested thoroughly. It's my intuition, sorry if it went wrong.
 2018-09-25 13:17:32 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Lipu Fei
51f2386db1 Merge remote-tracking branch 'origin/3.5' 2018-09-25 11:56:12 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference 
CURA-5682
 2018-09-25 11:52:53 +02:00
Ghostkeeper
a8493ee35d
Give black materials at least some albedo 
Otherwise you can't see the diffuse reflections and the entire thing just becomes a black silhouette.
 2018-09-25 11:24:48 +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
7360313ff7 Add LocalAuthServer test 
This is to ensure that once we try to login, it actually attempts to start the local server

CURA-5744
 2018-09-24 17:26:08 +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
Aleksei S
b44fb7ca24 Select correct material according to the active extruder 
CURA-5682
 2018-09-21 17:35:46 +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
Ghostkeeper
30ef724322
Update STL MIME type 
Since march, there is now an official MIME type for STL files. See https://www.iana.org/assignments/media-types/model/stl for the new MIME type specification.

Fixes #4141.
 2018-09-21 14:11:59 +02:00
Jaime van Kessel
d0fc4878c2 Fix number of mypy mistakes 
CURA-5744
 2018-09-21 13:54:37 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials 
CURA-5682
 2018-09-21 13:48:46 +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
Jaime van Kessel
dbe0d6d82a Add typing 2018-09-21 11:33:06 +02:00
Jaime van Kessel
83d53158bd Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-21 09:34:34 +02:00
Jaime van Kessel
054a49c63d Fix issue with inheritance manager button 
Removed one of the special detection cases, since it incorrectly removed a value from a stored profile

CURA=5646
 2018-09-21 09:33:25 +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
alekseisasin
520a181f88
Merge pull request #4383 from Ultimaker/check_setting_visibility 
Test incremental inclusion of setting visibility presets
 2018-09-20 16:41:58 +02:00
Jaime van Kessel
2dbaa304a0 Set textFormat for the setting items to PlainText 
Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto)
is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain.
I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.
 2018-09-20 15:22:35 +02:00
Lipu Fei
0bc91132ed Fix check_setting_visibility return value 2018-09-20 15:18:58 +02:00
Lipu Fei
884c5dea67 Add check_setting_visibility.py to Jenkinsfile 2018-09-20 15:14:50 +02:00
Lipu Fei
72b3f9eb2a Remove debugging lines 2018-09-20 15:12:54 +02:00
Lipu Fei
2c571d5886 Rework check_setting_visibility.py 2018-09-20 15:11:41 +02:00
Lipu Fei
eb114a8529 chmod a+x check_setting_visibility.py 2018-09-20 13:50:06 +02:00
Lipu Fei
6535f7890b Merge remote-tracking branch 'origin/3.5' 2018-09-20 10:26:17 +02:00
Lipu Fei
f912630d17
Merge pull request #4391 from Ultimaker/CURA-5095_collect_user_modified_settings 
Cura 5095 collect user modified settings
 2018-09-20 10:13:27 +02:00
Diego Prado Gesto
7ce3521831 Merge branch '3.5' 2018-09-20 08:57:50 +02:00