GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 295 Branches 268 Tags
Commit Graph

15890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 e87f3d7ca9cf135142bee488f188b9639c8b38fd.
 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
Diego Prado Gesto
4111318c7a Remove duplicate shortcut in French, so the CI won't fail on it. 2018-09-20 08:56:01 +02:00
Ghostkeeper
f99c48575e
Merge branch '3.5' 2018-09-19 17:31:52 +02:00
Ghostkeeper
ea4015c2cf
Fix missing report links 
My IDE crashed while doing a replace all. I see that it missed a few.

Contributes to issue CURA-5741.
 2018-09-19 17:31:39 +02:00
Ghostkeeper
95c9f9a2d5
Merge branch '3.5' 2018-09-19 17:27:00 +02:00
Ghostkeeper
ec42a96179
Update version number and fix reporting link 
I don't know, did we always have it refer to Uranium's issues page?

Contributes to issue CURA-5741.
 2018-09-19 17:25:57 +02:00
Ghostkeeper
f6b56a6506
Merge branch '3.5' 2018-09-19 17:16:14 +02:00
Ghostkeeper
91ed1171c2
Update translation sources for Cura 3.5 
This is updated from the new cura.pot template.

Contributes to issue CURA-5741.
 2018-09-19 17:15:09 +02:00
Ghostkeeper
f9923e5fe7
Remove duplicate messages 
These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory.

Contributes to issue CURA-5741.
 2018-09-19 17:13:53 +02:00
Ghostkeeper
10e0175947
Update translation templates for Cura 3.5 
These are the new strings for Cura 3.5.

Contributes to issue CURA-5741.
 2018-09-19 17:10:58 +02:00
Ghostkeeper
04b74d2285
Fix typo in Extra Infill Wall Count description 
Some very observant user found this small typo. Thanks.
 2018-09-19 13:58:09 +02:00
Ian Paschal
7ad6fc4cad
Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues 
Add confirmation dialogues before making destructive changes in UM3/S5 monitor
 2018-09-19 13:14:39 +02:00
Aleksei S
cb49ffa2d2 Updated the script according to the requested changes 
CURA-5734
 2018-09-18 17:42:01 +02:00
Ghostkeeper
28f743c9f4
Merge branch '3.5' 2018-09-18 17:30:08 +02:00
Ghostkeeper
44d828d137
Merge branch 'CURA-5725_simulation_stop_key_press' into 3.5 2018-09-18 17:29:35 +02:00
Diego Prado Gesto
ed9b0dd41b Add a missing bracket back. 
Contributes to CURA-5725.
 2018-09-18 17:25:35 +02:00
Ghostkeeper
e5154e90a7
Merge branch '3.5' 2018-09-18 17:19:03 +02:00
Ghostkeeper
e41361a053
Fan speed override is about supported areas, not bridged areas 
This is a correction suggested by Smartavionics (the author of that setting) on the Ultimaker forum thread about the 3.5 beta.
 2018-09-18 17:18:37 +02:00
Diego Prado Gesto
13cab3653e Remove unworking code that I forgot to remove after explaining a 
possible solution to myself.

Contributes to CURA-5725
 2018-09-18 17:09:57 +02:00
Diego Prado Gesto
c31f584e5b Fix my own mistake. The keys act throught the labels and the function in 
the labels is called setValue that then points to the setValueManually.

Contributes to CURA-5725.
 2018-09-18 17:04:24 +02:00
Diego Prado Gesto
0ef46feeae Fix code style. 
Contributes to CURA-5725.
 2018-09-18 16:53:25 +02:00
Diego Prado Gesto
f965b66c87 Stop the simulation also when the range slider is used. Reuse some code. 
Contributes to CURA-5725.
 2018-09-18 16:30:15 +02:00