GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,023 Commits 289 Branches 260 Tags
Commit Graph

610 Commits

Author SHA1 Message Date
Kostas Karmas
136fc90f48 Merge branch 'master' into CURA-7310_Template_export_inkection_call_custom_openUrl 2020-03-24 16:59:27 +01:00
Kostas Karmas
eaef9f0f45 Open plugin author page with custom openUrl 
CURA-7310
 2020-03-24 16:42:46 +01:00
Kostas Karmas
4f0f7dec5e Open material author page with custom openUrl 
CURA-7310
 2020-03-24 16:42:22 +01:00
Kostas Karmas
92cef02ee5 Open "buy material spool" with custom openUrl 
CURA-7310
 2020-03-24 16:38:25 +01:00
Kostas Karmas
e003d76c1e Open links in materials with custom openUrl 
CURA-7310
 2020-03-24 16:36:09 +01:00
Remco Burema
c20b2c6ee0
Merge pull request #7211 from Ultimaker/CURA-7150_proper_http_request_headers 
CURA-7150_proper_http_request_headers
 2020-03-24 11:25:07 +01:00
Nino van Hooff
72a66f1358 Do not use the JsonDecorator scope for binary downloads 
CURA-7150
 2020-03-20 17:31:21 +01:00
Nino van Hooff
96ed85f9c0 Move UltimakerCloudAuthentication and UltimakerCloudScope 
...to their own module
Fixes an import error where UltimakerCloudScope was used my both the
Toolbox and CuraDrive plugins

CURA-7150
 2020-03-12 17:48:54 +01:00
Nino van Hooff
61af28c681 Process review comments. 
CURA-7150
 2020-03-12 13:57:09 +01:00
Ghostkeeper
b572fc68de
Don't hard-code the application name 
As a response to the comment on commit d501f7730a42e45177fa3cdb89a4cdce1f1bd9a4.
 2020-03-06 15:54:23 +01:00
Jaime van Kessel
d501f7730a
Show Full name for quit message 
We're a bit insecure about Cura, so we have to put the company name in front of it ;)
 2020-03-02 10:48:47 +01:00
Nino van Hooff
7e2177a8cd Rename _loginStateChanged for consistency 
CURA-7251
 2020-02-25 16:25:03 +01:00
Nino van Hooff
cf689ee3b0 Hide the Cloud Sync message when the user logs out 
CURA-7251
 2020-02-25 16:21:06 +01:00
Nino van Hooff
27902fe38f Use JsonDecorator scope in the Toolbox and CloudSync 
Improves security by disallowing other content than json for requests

CURA-7150
 2020-02-25 14:41:02 +01:00
Dimitriovski
2b11152c4d
Added a comment(explanation) to an unused code of the Toolbox. 2020-02-25 12:06:11 +01:00
Ghostkeeper
f918f39fc2
Don't use a newline at the beginning of the sync message 
Again, this breaks stuff. See the previous commit.

Contributes to issue CURA-7201.
 2020-02-24 14:33:10 +01:00
Ghostkeeper
633bdac21a
Don't start message with a newline 
That breaks a couple of things:
* It messes up the layout of the message.
* The translations need to have this newline in as well, or they won't be accepted by gettext.
* The x-test translation puts 'xxxx' before the translation, so this one won't compile any more.

Contributes to issue CURA-7201.
 2020-02-24 14:21:39 +01:00
Dimitriovski
3e13507156
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-24 11:03:21 +01:00
Dimitriovski
9282423db1
Added lifetime=0 to the sync_message to make it stay there 2020-02-24 10:59:41 +01:00
Jaime van Kessel
238dd733ea
Merge branch '4.5' of github.com:Ultimaker/Cura 2020-02-17 17:01:38 +01:00
Nino van Hooff
507459660e Refactor: rename CloudPackageManager to CloudApiClient 2020-02-14 16:33:24 +01:00
Nino van Hooff
72c1b4d10c Fix LicensePresenter: reset state when presenting licenses 
CURA-7200
 2020-02-11 13:34:17 +01:00
Nino van Hooff
a33cfdfba6 Simplify package compatibility checking 
CURA-7207
 2020-02-11 11:21:28 +01:00
Ghostkeeper
ea9a9d58b1
Fix typing of list of API versions 
Contributes to issue CURA-7207.
 2020-02-11 11:09:02 +01:00
Ghostkeeper
0c42b1fdea
Code style: Method names with lower camelcase 
Contributes to issue CURA-7207.
 2020-02-11 11:06:33 +01:00
Ghostkeeper
bcf4bc8138
Simplify _is_any_version_compatible 
It now literally says: for any version, is it compatible?

Contributes to issue CURA-7207.
 2020-02-11 11:02:32 +01:00
Nino van Hooff
5beba6050f Fix api version checking 
CURA-7207
 2020-02-11 09:52:39 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1 
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
 2020-02-10 10:45:07 +01:00
Nino van Hooff
050ff62344 Don't show license Screen when there are no licenses to show 
CURA-7198
 2020-02-07 13:47:15 +01:00
Jaime van Kessel
15d83cc6da
Fix typing issue 2020-02-04 13:38:52 +01:00
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071 
CURA-7071/Added option to redirect to Web MP from Cura MP
 2020-02-04 11:02:30 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Jaime van Kessel
1fc0705c31
Remove a bit of over verbose logging 
It would put the content of the entire licence file into the log,
which seems a bit much to me.
 2020-02-03 13:20:08 +01:00
Jaime van Kessel
42f7cead4d
Merge branch 'CURA-7155_confusing_license_dialog_page_count' of github.com:Ultimaker/Cura 2020-02-03 13:16:23 +01:00
Nino van Hooff
a02b753d53 Count the number of packages which have a license to display 
CURA-7155
 2020-01-30 16:42:42 +01:00
Ghostkeeper
d437d480dc
Code style: Spaces around binary operators 
Contributes to issue CURA-7099.
 2020-01-30 16:10:36 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura 2020-01-30 15:32:21 +01:00
Remco Burema
99680db819
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-30 15:07:06 +01:00
Remco Burema
c6b6af14cf
Fix typo. 2020-01-30 15:06:47 +01:00
Nino van Hooff
eec7d2f0cd Use default timeout for sync dialog 2020-01-30 14:56:19 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog 
CURA-7152
 2020-01-30 12:51:13 +01:00
Jaime van Kessel
d15e64cc5b
Remove unused import 2020-01-30 09:44:15 +01:00
Jaime van Kessel
18163af5a3
Ensure that the default default marketplace URL is used when not defined 
CURA-7071
 2020-01-30 09:42:51 +01:00
Nino van Hooff
8c250cfbbc Process review comments 
CURA-7099
 2020-01-29 11:28:29 +01:00
Ghostkeeper
242da1b3aa
Give web marketplace button a hover colour 
It needs to be the same as the bar beneath the marketplace tab buttons when highlit.

Contributes to issue CURA-7071.
 2020-01-28 14:47:00 +01:00
Ghostkeeper
6553443f3b
Make marketplace materials link slightly smaller 
Contributes to issue CURA-7071.
 2020-01-28 14:41:29 +01:00
Ghostkeeper
38e7a9e4df
Turn Marketplace link into an actual link 
With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.

Contributes to issue CURA-7071.
 2020-01-28 14:37:59 +01:00
Ghostkeeper
e51a1b18be
Add link text to marketplace search page 
Contributes to issue CURA-7071.
 2020-01-28 14:19:33 +01:00
Ghostkeeper
1c79193f9a
Always go to plug-ins page regardless of active tab 
This was a requirement from UX. Apparently we're adding a link to the materials elsewhere.

Contributes to issue CURA-7071.
 2020-01-28 13:25:27 +01:00
Nino van Hooff
d4eb463f2d Always subscribe to packages after installing them 
Now that we subscribe for all situations where a package is installed,
it makes sense to watch package installs and create a 1:1 relation that
way. Prevents code duplication.

CURA-7099
 2020-01-28 13:08:57 +01:00