3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
18462 commits 312 branches 275 tags 718 MiB
Commit graph

695 commits

Author SHA1 Message Date
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section' 
Contributes to issue CURA-5916.
 2019-02-08 09:32:56 +01:00
Diego Prado Gesto
b0cf5f25c6 Merge branch '4.0' 2019-02-07 17:36:44 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Jaime van Kessel
eb6f65d4ec Add print-guideline icon 
CURA-5916
 2019-02-07 15:19:46 +01:00
Jaime van Kessel
e869829f10 Updated the icon so it also works in the dark theme 2019-02-07 15:17:07 +01:00
Jaime van Kessel
c15089cd59 Some minor cleanup of the QML 
CURA-5916
 2019-02-07 14:13:00 +01:00
Jaime van Kessel
575f323ea1 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-06 13:07:09 +01:00
Ian Paschal
58d998af68 Add theme entry for message image 
Contributes to CL-1222
 2019-02-06 11:58:22 +01:00
Lipu Fei
4ea6e5d0df Merge remote-tracking branch 'origin/4.0' 2019-02-05 11:40:50 +01:00
Jaime van Kessel
d59889a4ab Fix logo in about popup 2019-02-05 11:13:47 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Remco Burema
203f699d0a Override message-box bg-color in dark theme. [CURA-6169] 2019-02-01 11:24:50 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Ian Paschal
858e2f6b42 Add some theme dependencies 
Contributes to CL-1154
 2019-01-31 10:49:33 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
784598d4a2 Remake: sign in page 
CURA-6132
 2019-01-30 15:37:25 +01:00
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Jaime van Kessel
13b2b33900 Remove unused theme option 2019-01-25 13:02:39 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Jaime van Kessel
228614a590 Remove unused values from theme.json 
CURA-6115
 2019-01-25 11:20:50 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
e204696b61 Add dark theme 
Contributes to CL-1165
 2019-01-23 12:10:06 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab 
Contributes to CL-1212
 2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors" 
This reverts commit 2e5eb61144.
 2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors 
Contributes to CL-1212
 2019-01-21 13:07:16 +01:00
Diego Prado Gesto
5e3dedf62b Merge branch '4.0' 2019-01-20 21:25:19 +01:00
Ghostkeeper
4cb7ee5fc7
Give tabs a height 
It is used in the profile assistant. I don't know if it should be used, but it is.

Contributes to issue CURA-6086.
 2019-01-17 17:23:21 +01:00
Remco Burema
e7ba543fec
Merge pull request #5172 from Ultimaker/resize_bar_ui_changes 
Change the style of the resize bar
 2019-01-17 16:59:18 +01:00
Jaime van Kessel
24fbb1007d Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-16 17:39:43 +01:00
Diego Prado Gesto
2435b97ef7 Change the style of the resize bar at the bottom of the print setup panel 
Make it wider and more visible to the user.
Change icon.
Keep margins according to the other panels.
 2019-01-15 12:12:47 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
ChrisTerBeke
2e3398e349 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 15:10:44 +01:00
Jaime van Kessel
614b1000fd Added missing material compatibility chart link 
CURA-6090
 2019-01-10 15:36:36 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
ChrisTerBeke
32415f4d8e Merge branch '4.0' into STAR-322_cloud-connection 2019-01-08 13:19:36 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Lipu Fei
4cb853cdb0 Fix (bigger) fonts for Chinese and Japanese 
CURA-6085
 2019-01-08 10:51:30 +01:00
Lipu Fei
2124de3d4d Revert "Chnage default font sizes and unify font weights" 
This reverts commit af634b82b2.

CURA-6085
 2019-01-08 10:45:52 +01:00
Lipu Fei
af634b82b2 Chnage default font sizes and unify font weights 
CURA-6085
 2019-01-08 09:39:50 +01:00