GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-24 06:39:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,533 Commits 286 Branches 260 Tags
Commit Graph

19533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Ghostkeeper
d4b17735ad
Merge branch '4.1' 2019-05-02 08:51:22 +02:00
Ghostkeeper
038a5b5942
Fix background of g-code text boxes having zero size 2019-05-02 08:46:46 +02:00
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts. 
Contributes to CURA-6434.
 2019-05-01 15:53:54 +02:00
Diego Prado Gesto
5b06efdd19 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-01 15:51:12 +02:00
Diego Prado Gesto
32c8bbfb3c Modify small UI things in the Add Printer dialog 2019-05-01 15:50:43 +02:00
Ian Paschal
7d9b0e0b82
Merge pull request #5677 from Ultimaker/fix_rendering_issues 
Fix rendering issues in Monitor Page
 2019-05-01 15:28:16 +02:00
Ghostkeeper
b9284e3e83
Merge branch '4.1' 2019-05-01 14:41:36 +02:00
Ghostkeeper
ab0cef95e8
Sort secondarily by printer name 
Makes it a bit easier to find printers.

Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/
 2019-05-01 14:38:55 +02:00
Ghostkeeper
154efdf14d
Merge branch '4.1' 2019-05-01 14:13:44 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1 2019-05-01 14:13:25 +02:00
Ghostkeeper
15fae58d9b
Use text wrapping so it's scrollable in Qt 5.12 
I don't know if it's really in Qt 5.12 or maybe it's the Ubuntu implementation or whatever. But this works for me now.

Contributes to issue CURA-6434.
 2019-05-01 14:13:10 +02:00
Ghostkeeper
7258ad8dc2
Fix nesting of ULs 
A <ul> tag is only allowed to have <li> tags inside it, so the nested <ul> tag needs to be inside the <li> tag.

Contributes to issue CURA-6434.
 2019-05-01 14:08:53 +02:00
Ghostkeeper
8d6136bcf3
Don't crash when materials are not registered 
It can't update the nodes structure with the links between materials then.

Contributes to issue CURA-6444.
 2019-05-01 13:14:40 +02:00
Lipu Fei
c26dbfd934 Improve example data HTML 
CURA-6434
 2019-05-01 10:27:16 +02:00
Jaime van Kessel
db1678adf8 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 14:13:10 +02:00
Jaime van Kessel
d1a29ca87d Merge branch 'fix_ufpreader_libcharon' of https://github.com/fieldOfView/Cura into 4.1 2019-04-30 14:09:22 +02:00
fieldOfView
b0b162c8d5 Fix error when libCharon is not available 2019-04-30 13:03:17 +02:00
Jaime van Kessel
af6d30c067 Fix some typos 2019-04-30 11:39:45 +02:00
Jaime van Kessel
0a136b58f0 Also add the right metadata to the AMF plugin. 
This ensures that the filetype shows up in the supported types of the open window
 2019-04-30 11:38:55 +02:00
Jaime van Kessel
0bd516da4c Add mimetype to amf plugin 2019-04-30 11:34:30 +02:00
Diego Prado Gesto
7249bd3c50 Remove two lines entered by mistake 
Keep it the same as in the base branch.
 2019-04-30 11:33:19 +02:00
Diego Prado Gesto
f62d19aa60 Fix rendering issues in macOS when connecting to secondary screen 
It used to happen before, but just adding native rendering fixes the issue.
 2019-04-30 11:24:01 +02:00
Jaime van Kessel
c394ce74c3 Merge branch 'feature_amf_reader' of https://github.com/fieldOfView/Cura 2019-04-30 11:23:19 +02:00
Jaime van Kessel
4d1f5cc556 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-30 10:51:42 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Jaime van Kessel
3f47ffeae7 Use only the active extruders when sending slice message 
Fixes #5671
 2019-04-30 10:50:57 +02:00
Diego Prado Gesto
24d57f6168 Change text according to experts 
Also make the bottom text a bit longer so the link goes completely in the second line.

Contributes to CURA-6434.
 2019-04-30 09:51:21 +02:00
Ghostkeeper
73f1b3fb50
Merge branch 'stereotech-master' 2019-04-30 09:40:43 +02:00
Ghostkeeper
7f3cedc12f
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-30 09:29:19 +02:00
frylock34
0b364e8daf reduce platform size 2019-04-30 10:39:05 +04:00
Diego Prado Gesto
9bf77e9302 Add icons for the send anonymous data welcome page 
Contributes to CURA-6434.
 2019-04-29 17:29:38 +02:00
Diego Prado Gesto
46f1f00cb9 Change example data to contain HTML instead of JSON format 
Then it's easier for us to show a more readable information about the data we collect

Contributes to CURA-6434.
 2019-04-29 17:24:51 +02:00
Jaime van Kessel
56c0cae71f DoubleClick and drag no longer contradict eachother for expandable component 
CURA-6478
 2019-04-29 15:13:01 +02:00
Diego Prado Gesto
534a035841 Add a grid with images 
Those images indicate the type of data we are collecting anonymously.

Contributes to CURA-6434.
 2019-04-29 14:50:14 +02:00
Jaime van Kessel
a14b331cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-29 13:47:34 +02:00
Diego Prado Gesto
9d48a90f8f Add two labels instead of one 
Change the link to adhere to the color scheme

Contributes to CURA-6434.
 2019-04-29 13:45:55 +02:00
Jaime van Kessel
5359293d7a Merge branch 'CURA-6156_build_volume_temperature' of github.com:Ultimaker/Cura 2019-04-29 13:29:35 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName() 
CURA-6449
 2019-04-29 13:28:18 +02:00
Ghostkeeper
ccc24a2e5f
Merge branch '4.1' 2019-04-29 12:07:09 +02:00
Ghostkeeper
25bbc1e66e
Set default infill density for tree support to 0% in profiles 
In profiles that overwrite the support infill density, also keep it 0% for tree support.
Except PVA profiles. Those are probably better off with their normal infill density.

Fixes #5297.
 2019-04-29 12:06:54 +02:00
Jaime van Kessel
e5d7387fed Updated the documentation of the contentAlignment property 2019-04-29 11:54:33 +02:00
Jaime van Kessel
9e0d047815 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-29 10:51:25 +02:00
Jaime van Kessel
79fbe12e92 Add an extra check to enforce min height of printSetupSelector 
CURA-6478
 2019-04-29 10:49:33 +02:00
Jaime van Kessel
db1a5ec8c0 Add mousearea to prevent clicking through the printSetupSelector 
CURA-6478
 2019-04-29 10:38:05 +02:00
Jaime van Kessel
8d0a31dcfb Show tooltip on the right side if the setting area is to far to the left 
CURA-6478
 2019-04-29 10:33:02 +02:00
Ghostkeeper
53d0dd282b
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-29 08:54:05 +02:00
Lipu Fei
d21c0a4ca9 Merge remote-tracking branch 'origin/4.1' 2019-04-26 15:52:37 +02:00
Ghostkeeper
b3b59d5a5c
Add typing 2019-04-26 15:42:22 +02:00