3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
19477 commits 307 branches 272 tags 787 MiB
Commit graph

19477 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lipu Fei
04c39824cb Fix typing 2019-04-26 15:39:28 +02:00
Jaime van Kessel
a86311fea3 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-26 15:25:58 +02:00
Jaime van Kessel
0d8b625bf8 Properly cache slice values to speed up sending the slice 2019-04-26 15:25:31 +02:00
Ghostkeeper
9aa11ed091
Merge branch '4.1' 2019-04-26 14:15:21 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Diego Prado Gesto
17c06f200f Change the copy of the account benefits 
As per @mahtDFR request
 2019-04-26 14:04:46 +02:00
Lipu Fei
5ab2f9784d Fix unit test 
CURA-6483
 2019-04-26 13:55:12 +02:00
Diego Prado Gesto
c7bee73af6 Add cross cursor to the draggable expandable component. 
Contributes to CURA-6478.
 2019-04-26 13:49:55 +02:00
Lipu Fei
278d8ee587 Fix button enabled flags 
CURA-6483
 2019-04-26 13:30:26 +02:00
Lipu Fei
dbd8d4e74c Use IPv4 and IPv6 regex to validate IP input 
CURA-6483
 2019-04-26 12:48:30 +02:00
Jaime van Kessel
f48bc7a047 Fixed highlighting matching configuration if a material is empty 2019-04-26 12:00:57 +02:00
Jaime van Kessel
c32c642ba5 Fixed highlighting matching configuration if a material is empty 2019-04-26 11:59:16 +02:00
Jaime van Kessel
8210317c91 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-26 11:04:55 +02:00
Jaime van Kessel
ac8cca31d1
Merge pull request #5667 from Ultimaker/CURA-6478_drag_expandable_component 
Make Expandable Components Draggable [CURA-6478]
 2019-04-26 11:03:52 +02:00
Lipu Fei
fcbec80ca0 Merge remote-tracking branch 'origin/4.1' 2019-04-26 07:42:45 +02:00
Remco Burema
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Remco Burema
c3a9ceaa18 Remove a line of commented-out code. [CURA-6478] 2019-04-25 22:42:52 +02:00
Remco Burema
77d8095208 Home/dock expandable-draggable on double-click. [CURA-6478] 2019-04-25 22:26:51 +02:00
Remco Burema
ac67e1a3a9 Make expandable component preferences load again. [CURA-6478] 2019-04-25 22:08:25 +02:00
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +02:00
Remco Burema
bd262ca6c4 Set min.-height and 'stage-awareness' for print-setup-UI. [CURA-6478] 2019-04-25 15:37:52 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Jaime van Kessel
078707a726 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-25 14:12:15 +02:00
Jaime van Kessel
da736cc4be Add import redirects with deprecation warning so we don't break plugin compatibility 2019-04-25 14:11:42 +02:00
Remco Burema
baac2d1a0f Fix various expandable/dragable/window interactions. [CURA-6478] 2019-04-25 13:33:31 +02:00
Lipu Fei
4948fad87c Merge remote-tracking branch 'origin/4.1' 2019-04-25 13:22:23 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string 
CURA-6449
 2019-04-25 13:14:28 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request 
CURA-6483
 2019-04-25 11:55:49 +02:00
Lipu Fei
b22073e170 Add timeout for manual IP requests 
CURA-6483
 2019-04-25 11:54:32 +02:00
Remco Burema
9283c3d321 Add window-size handling to draggable component. [CURA-6478] 2019-04-25 11:08:13 +02:00
Ghostkeeper
1da88df399
Merge branch '4.1' 2019-04-25 10:55:39 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key 
It is already serialised in the 'hardware compatible' settings.
 2019-04-25 10:55:17 +02:00
Ghostkeeper
0ad9d000ab
More consistent capital letter usage 2019-04-25 10:55:17 +02:00
Lipu Fei
9868dee474 Fix typing 
CURA-6483
 2019-04-25 08:57:57 +02:00
Lipu Fei
2e32b33bbb Merge remote-tracking branch 'origin/4.1' 2019-04-25 08:48:34 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Remco Burema
7382798b6a Move setting the dragged-to position to its own function. [CURA-6478] 2019-04-25 08:43:36 +02:00
Remco Burema
78f15d8fcb Margins to main window for draggable component. 2019-04-25 08:43:36 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Remco Burema
28a14c0a3b Make expandable component dragable. 2019-04-25 08:43:36 +02:00
Lipu Fei
f04b0c3fcc Increase the size of network printer list 
The local printer list utilizes the whole space, but the network printer
list is only use half of the space.
 2019-04-25 08:18:41 +02:00
Jaime van Kessel
b2e2f088c4 Add even more logging to the auth service 2019-04-24 16:44:13 +02:00
Jaime van Kessel
b1375a9927 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-24 16:17:43 +02:00
Jaime van Kessel
46403a0fde Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-24 16:03:42 +02:00
Jaime van Kessel
d69eb89f17 Fix refresh token not being stored in the bootup refresh case 2019-04-24 16:03:12 +02:00
Simon Edwards
da539b34f5
Merge pull request #5661 from Ultimaker/CL-1055_show_sliced_for_pills_on_print_jobs 
CL-1055 show sliced for pills on print jobs
 2019-04-24 14:59:50 +02:00
Simon Edwards
1336d0c7f3
Merge pull request #5657 from Ultimaker/CL-1055_show_sliced_for_pills_on_print_jobs 
CL-1055 Show "sliced for" pills on print jobs
 2019-04-24 14:48:22 +02:00