GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,559 Commits 290 Branches 260 Tags
Commit Graph

271 Commits

Author SHA1 Message Date
Ghostkeeper
e9216936d7
Compare SDK version as Version instances 
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
 2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field 
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
 2018-11-15 15:13:36 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
Remco Burema
8e05c2adcb Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922] 2018-11-09 15:27:02 +01:00
Ghostkeeper
7f54cacd0f
Code style 
Discovered during work on CURA-5840.
 2018-11-09 14:11:38 +01:00
Remco Burema
c8d9ad37ff Add Printing Guidelines links to materials in Marketplace. [CURA-5922] 2018-11-09 13:49:14 +01:00
Remco Burema
21d4cd8f9f Add Safety Data Sheet links to materials in Marketplace. [CURA-5922] 2018-11-09 13:44:42 +01:00
Jaime van Kessel
d3302938b2 Fix technical data sheet not showing if there is no support_configs 2018-11-08 16:38:38 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application 
CURA-5840
 2018-11-08 12:04:43 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Jaime van Kessel
44954c4cad Fixes required for semantic versioning 
CURA-5840
 2018-11-01 14:15:16 +01:00
Remco Burema
5cb72e298d
Merge pull request #4700 from Ultimaker/CURA-5873_fix_duplicated_generic_materials 
Fix duplicated generic materials
 2018-10-31 11:47:09 +01:00
Diego Prado Gesto
3e37f2a09d Reset the list of generic materials to emtpy when creating the models. 
Contributes to CURA-5873.
 2018-10-31 10:31:20 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +01:00
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b038a189238c59eff69035a446382d74a.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb264699174a8edcfc20e50e22c455ef32.
 2018-10-03 16:27:13 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
Aleksei S
959f698b03 Update date format 
CURA-5762
 2018-10-03 13:23:37 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
77fd05ac70 Disable other buttons while toolbox is downloading to avoid crashes. 
I did it that way to not be risky because we're close to the release.

Contributes to CURA-5778.
 2018-10-01 17:21:34 +02:00
Lipu Fei
3b62284276 Merge remote-tracking branch 'origin/3.5' 2018-09-18 16:15:55 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files 
CURA-5718
 2018-09-18 15:53:56 +02:00
Lipu Fei
4777c3f41d Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins' 2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674 isInstalled() should check old plugins as a fallback 2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc Remove unneeded code 2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a Fix missing import 2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins 2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119 Merge remote-tracking branch 'origin/3.5' 2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072 Fix SDK version comparison 2018-09-17 16:14:28 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later 
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
 2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5' 2018-09-17 10:54:44 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Ghostkeeper
5a374f31ef
Merge branch '3.5' 2018-09-13 16:27:49 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
Jaime van Kessel
c59ff82c64 Revert "[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)" 
This reverts commit f9585b5fae9cdd3f56dc8d8b04f28db5fcf15434.
 2018-09-12 13:39:10 +02:00
Jaime van Kessel
00494d8301 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-12 13:38:56 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them. 
CURA-5618
 2018-09-11 16:05:53 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered 
calls to the api don't work yet.

Contributes to CURA-5670.
 2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00