Ghostkeeper
|
7d871e5a18
|
Update text for pre-login screen
This is a new text that we got from marketing.
|
2019-02-04 13:06:06 +01:00 |
|
Lipu Fei
|
44f986d661
|
Fix combox style for support extruder in recommended
CURA-6144
|
2019-02-01 13:31:23 +01:00 |
|
Jaime van Kessel
|
4aaeb8c2d5
|
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
|
2019-02-01 11:54:35 +01:00 |
|
Lipu Fei
|
efa26c8323
|
Merge remote-tracking branch 'origin/4.0'
|
2019-02-01 11:08:33 +01:00 |
|
Lipu Fei
|
60a4fb3151
|
Fix missing "group_name" renaming
CURA-6153
|
2019-02-01 10:23:51 +01:00 |
|
Remco Burema
|
954fdb20ad
|
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
|
2019-01-31 20:21:42 +01:00 |
|
Jaime van Kessel
|
e6f722b29c
|
Move additional component loader into ActionPanelWidget
|
2019-01-31 17:13:32 +01:00 |
|
Lipu Fei
|
c73747ad44
|
Merge remote-tracking branch 'origin/4.0'
|
2019-01-31 14:22:59 +01:00 |
|
Lipu Fei
|
f0d9aa77c2
|
Make account button non-fixed-width
CURA-6132
|
2019-01-31 09:43: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
|
de4db19234
|
Remake: account panel
CURA-6132
|
2019-01-30 15:37:34 +01:00 |
|
Lipu Fei
|
784598d4a2
|
Remake: sign in page
CURA-6132
|
2019-01-30 15:37:25 +01:00 |
|
Lipu Fei
|
6aebdade73
|
Remake: Change to "sign in" button
CURA-6132
|
2019-01-30 15:37:20 +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
|
a6688b9609
|
Merge branch '4.0'
|
2019-01-30 12:59:39 +01:00 |
|
Ghostkeeper
|
430be551d3
|
Fix link to properties of row
This fixes a QML warning and probably fixes the visibility of these elements.
|
2019-01-30 12:59:27 +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 |
|
Lipu Fei
|
87bdd10dab
|
Merge remote-tracking branch 'origin/4.0'
|
2019-01-28 14:03:51 +01:00 |
|
Lipu Fei
|
1f21eed14f
|
Add Text.NativeRendering for Labels
CURA-6141
|
2019-01-28 09:05:43 +01:00 |
|
Lipu Fei
|
c6ff8149f6
|
Remove colon according to design
CURA-6141
|
2019-01-28 09:04:08 +01:00 |
|
Lipu Fei
|
71b2787d0d
|
Use Label
CURA-6141
|
2019-01-28 08:48:02 +01:00 |
|
Remco Burema
|
3d413ceb2c
|
MaterialInfo: Tweak text-alignment/layout. [CURA-6141]
|
2019-01-26 11:43:15 +01:00 |
|
Remco Burema
|
e7ff70870f
|
MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141]
|
2019-01-26 11:25:38 +01:00 |
|
Ghostkeeper
|
33abbd4c89
|
Merge branch '4.0'
|
2019-01-25 12:03:38 +01:00 |
|
Jaime van Kessel
|
8f8b13f7c4
|
Let Cura define how the message actions look like
CURA-6115
|
2019-01-25 11:07:37 +01:00 |
|
Remco Burema
|
7fdbb11f49
|
MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141]
|
2019-01-24 21:56:57 +01:00 |
|
Remco Burema
|
654cd8e645
|
MaterialInfo: Begin replace HTML-text with QML-elements for 'by material-type'. [CURA-6141]
|
2019-01-24 18:08:02 +01:00 |
|
Ghostkeeper
|
cbed8038e9
|
Don't say that creating a profile needs to provide a 'new' name
It's weird to ask for a new name if the profile is completely new.
Made together with a change in Uranium for CURA-6086.
|
2019-01-23 17:35:33 +01:00 |
|
Diego Prado Gesto
|
551111bd60
|
Close the configuration panel when the user syncs with a configuration
|
2019-01-23 11:24:28 +01:00 |
|
Jaime van Kessel
|
aac82a0852
|
Merge branch '4.0' of github.com:Ultimaker/Cura
|
2019-01-23 11:18:27 +01:00 |
|
Ghostkeeper
|
9a0a084339
|
Code style
|
2019-01-23 11:11:40 +01:00 |
|
Jaime van Kessel
|
0942bebaf8
|
Move troubleshoot link to help menu
|
2019-01-22 16:19:29 +01:00 |
|
Lipu Fei
|
9bc748ffa1
|
Fix scrolling with configurations
CURA-6125
|
2019-01-22 11:48:41 +01:00 |
|
Diego Prado Gesto
|
5e3dedf62b
|
Merge branch '4.0'
|
2019-01-20 21:25:19 +01:00 |
|
Jaime van Kessel
|
a51289d7ce
|
Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura
|
2019-01-18 11:19:28 +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 |
|
Ghostkeeper
|
a01063b7d8
|
Merge branch '4.0'
|
2019-01-17 16:32:18 +01:00 |
|
Ghostkeeper
|
13c1a70677
|
Fix margin
The theme entry didn't exist.
Discovered during work on CURA-6086, but for the rest unrelated.
|
2019-01-17 16:31:50 +01:00 |
|
Remco Burema
|
98ce0caaef
|
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
Remove loading gif
|
2019-01-17 16:17:00 +01:00 |
|
Jaime van Kessel
|
94cf61ca18
|
Merge branch '4.0' of github.com:Ultimaker/Cura
|
2019-01-17 14:28:35 +01:00 |
|
Jaime van Kessel
|
aff2ffc67a
|
Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0
|
2019-01-17 14:23:06 +01:00 |
|
Jaime van Kessel
|
12a120f044
|
Slightly modify the variant label to match more with the monitor tab
CURA-6100
|
2019-01-17 14:21:11 +01:00 |
|
Jaime van Kessel
|
0ce0228f76
|
Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0
|
2019-01-17 14:03:43 +01:00 |
|
Jaime van Kessel
|
15563a756f
|
Merge branch '4.0' of github.com:Ultimaker/Cura
|
2019-01-17 13:42:58 +01:00 |
|