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

635 Commits

Author SHA1 Message Date
Jelle Spijker
5ae4ce3b9b
Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-04-22 15:20:39 +02:00
Jelle Spijker
2f632def86
Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-04-22 15:18:48 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6 
CURA-7383
 2020-04-21 11:46:12 +02:00
Jaime van Kessel
ab62ac6e01
Merge branch 'CURA-7364_cloud_sync_message_duplicated' of github.com:Ultimaker/Cura into 4.6 2020-04-16 13:17:40 +02:00
Nino van Hooff
db758a7e19 Add None-checks to CloudPackageChecker 
Might help prevent the sync message to show multiple times

CURA-7364
 2020-04-15 17:16:38 +02:00
Jaime van Kessel
8ba71fde44
Merge branch 'split_bundled_unbundled_option_2' of github.com:Ultimaker/Cura 2020-04-02 14:34:17 +02:00
Remco Burema
8d6cbdf673
Fix long materials title causes misalign. 
CURA-7240
 2020-04-01 17:57:33 +02:00
Remco Burema
07569c6b88
Fix extra line after plugin/materials list. 
CURA-7240
 2020-04-01 17:54:56 +02:00
Ghostkeeper
4edef85346
Code style: Space around binary operators 
Contributes to issue CURA-7240.
 2020-04-01 17:35:40 +02:00
Remco Burema
90ffa2a772
Explain empty installed materials/plugins brackets. 
part of CURA-7240
 2020-03-31 16:56:45 +02:00
Jaime van Kessel
c764326c25
Fix marketplace installed plugins/materials empty rectangle 
CURA-7240
 2020-03-31 15:57:08 +02:00
Remco Burema
d89fce6240
Order bundled/installed packages/materials section. 
And other finishing touches.
part of CURA-7240
 2020-03-31 12:02:46 +02:00
Remco Burema
85490dc58a
[Marketplace] De-emphasize pre-installed packages. 
Tried to do it the elegant way, couldn't get that to work within timebox.
part of CURA-7240
 2020-03-31 11:52:55 +02:00
Kostas Karmas
189c734145 Changed wrapMode to WordWrap, similar to master 
CURA-7332
 2020-03-31 11:41:03 +02:00
Kostas Karmas
5581705a0f Revert "Wrap the restart prompt text in Marketplace" 
This reverts commit 2978b09e26b30b3ce007db04fdb8ce05026f35fa.
 2020-03-31 11:32:34 +02:00
Kostas Karmas
2978b09e26 Wrap the restart prompt text in Marketplace 
CURA-7332
 2020-03-31 11:24:23 +02:00
Kostas Karmas
6b6446e201 Wrap the restart prompt text in Marketplace 
CURA-7332
 2020-03-31 11:22:07 +02:00
Jaime van Kessel
da4bb127df
Add wordWrap to restart required message 
In some languages (and on some operating systems) the
text would be cut off by the button
 2020-03-31 10:56:03 +02:00
konskarm
bba6a5cc39
Merge pull request #7144 from Ultimaker/CURA-7162/replace_robot_with_placeholder 
CURA-7162/Replace the default logobot.svg with a new placeholder
 2020-03-30 15:05:37 +02:00
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
Dimitriovski
24e2fc89e5
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7162/replace_robot_with_placeholder 2020-02-27 11:20:38 +01:00
Dimitriovski
77cf63acfa
Removed the new placeholder from WelcomePage.qml as we probably want to see the Robot there instead of the hexagon. 
CURA-7162
 2020-02-27 11:20:32 +01:00
Dimitriovski
1acfaf9705
added sourceSize property to qml's Image for better rendering 
CURA-7162
 2020-02-27 11:19:44 +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
3a0da99256
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7162/replace_robot_with_placeholder 2020-02-24 11:13:29 +01:00
Dimitriovski
35b7ce90d3
Added the placeholder.svg file 
CURA-7162
 2020-02-24 11:13:13 +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
Dimitriovski
510acfab62
Replaced the logobot.svg image with a new placeholder.svg image 
CURA-7162
 2020-02-21 17:05:27 +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