Ian Paschal
|
3bd5d141ab
|
Add easing and make animation less snappy and awesome
Contributes to CL-1151
|
2018-12-14 15:39:17 +01:00 |
|
Ian Paschal
|
2f6a274c0e
|
Small style improvements
Contributes to CL-1151
|
2018-12-14 15:27:55 +01:00 |
|
Lipu Fei
|
ae695b77e6
|
Add native rendering for QML Label
CURA-6013
|
2018-12-14 15:23:59 +01:00 |
|
Ian Paschal
|
b2ea597543
|
Fix button color
Contributes to CL-1151
|
2018-12-14 15:10:34 +01:00 |
|
Ian Paschal
|
5d0da580b9
|
Fix border colors
|
2018-12-14 15:04:22 +01:00 |
|
Ghostkeeper
|
2e835bf48d
|
Merge branch '4.0'
|
2018-12-14 15:02:30 +01:00 |
|
Ian Paschal
|
7fc5742b7f
|
Add monitor carousel
Contributes to CL-1151
|
2018-12-14 15:01:40 +01:00 |
|
Daniel Schiavini
|
2f08854097
|
STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished
|
2018-12-14 14:50:15 +01:00 |
|
Jaime van Kessel
|
b70a4ae0a2
|
Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0
|
2018-12-14 13:35:37 +01:00 |
|
Ghostkeeper
|
64e436f814
|
Merge branch '4.0'
|
2018-12-14 13:27:54 +01:00 |
|
Daniel Schiavini
|
4dc8edb996
|
STAR-322: Fixing the multipart upload
|
2018-12-14 12:48:40 +01:00 |
|
ChrisTerBeke
|
53eae3ee92
|
Merge branch '4.0' into STAR-322_cloud-connection
|
2018-12-14 12:04:31 +01:00 |
|
Jaime van Kessel
|
6a3ac99551
|
Ensure that all icons use the same color from theme.
Also added some fixes for the dark theme
|
2018-12-14 11:59:22 +01:00 |
|
Lipu Fei
|
cd3a9e02d6
|
Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash
|
2018-12-14 11:45:51 +01:00 |
|
Lipu Fei
|
a1ad7851d9
|
Merge remote-tracking branch 'origin/4.0' into CURA-6011_connection_types
|
2018-12-14 11:11:40 +01:00 |
|
Jaime van Kessel
|
edd4f6e1fa
|
Fix some minor QML warnings
CURA-6013
|
2018-12-14 11:02:10 +01:00 |
|
Jaime van Kessel
|
7616f9c97d
|
Make hardcoded color themeable
CURA-6013
|
2018-12-14 10:59:59 +01:00 |
|
Jaime van Kessel
|
450f301c8c
|
Fix binding loop
CURA-6013
|
2018-12-14 10:56:13 +01:00 |
|
Lipu Fei
|
aba3b6dd8e
|
Rename setKey() and add docs
CURA-6011
|
2018-12-14 10:55:36 +01:00 |
|
Jaime van Kessel
|
bb1bf14a01
|
Prevent rating when user is not logged in
CURA-6013
|
2018-12-14 10:46:31 +01:00 |
|
Lipu Fei
|
6bf39a32a9
|
Rename Enum names to camal cases
CURA-6011
|
2018-12-14 09:56:10 +01:00 |
|
ChrisTerBeke
|
e1f95c6ec1
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-14 09:24:56 +01:00 |
|
Ghostkeeper
|
bb45680b98
|
Merge branch '4.0'
|
2018-12-13 16:49:57 +01:00 |
|
Ghostkeeper
|
3f3cd5e334
|
Remove broken load of PrepareSidebar.qml
This file no longer exists. Loading it gives a warning.
|
2018-12-13 16:32:49 +01:00 |
|
Aleksei S
|
973970a895
|
Every print ouput device should define its connection type(usb, network, cluster and etc)
CURA-6011
|
2018-12-13 16:00:12 +01:00 |
|
Lipu Fei
|
3225512851
|
Fix typing
CURA-6013
|
2018-12-13 15:48:06 +01:00 |
|
Lipu Fei
|
17c93dea80
|
Fix merge conflicts with 4.0
|
2018-12-13 14:39:28 +01:00 |
|
Diego Prado Gesto
|
aa2fa371c4
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2018-12-13 14:32:28 +01:00 |
|
Diego Prado Gesto
|
17f0c12858
|
Make the middle component to have zero width if there is no component to
fill the gap.
Contributes to CURA-6020.
|
2018-12-13 14:31:34 +01:00 |
|
Lipu Fei
|
620790ae3d
|
Reduce the creations of ExtrudersModels
CURA-6015
|
2018-12-13 14:12:23 +01:00 |
|
Lipu Fei
|
2cf80b4578
|
Remove unused simpleNames flag
CURA-6015
|
2018-12-13 14:12:04 +01:00 |
|
ChrisTerBeke
|
518d7fac51
|
Fix merge conflict
|
2018-12-13 13:44:33 +01:00 |
|
Jaime van Kessel
|
b64882bb1e
|
Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0
|
2018-12-13 13:23:47 +01:00 |
|
ChrisTerBeke
|
819f8531a2
|
Use CuraConstants for Cloud printing API root
|
2018-12-13 11:54:10 +01:00 |
|
ChrisTerBeke
|
36f5150d94
|
Fix merge conflict
|
2018-12-13 11:48:35 +01:00 |
|
Diego Prado Gesto
|
121af7ad60
|
Reuse the primary button in the toolbox for the "Quit Cura" button
|
2018-12-13 09:41:07 +01:00 |
|
Diego Prado Gesto
|
635115a879
|
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
|
2018-12-13 09:32:01 +01:00 |
|
Diego Prado Gesto
|
77ede1ae6b
|
Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
|
2018-12-12 17:50:21 +01:00 |
|
Daniel Schiavini
|
fed779d0d2
|
STAR-322: Implementing multi-part upload (doesnt always work)
|
2018-12-12 17:31:08 +01:00 |
|
ChrisTerBeke
|
6150bd665a
|
Merge branch 'master' into STAR-322_cloud-connection
|
2018-12-12 14:04:59 +01:00 |
|
Lipu Fei
|
b6ea61612e
|
Fix merge conflicts
|
2018-12-12 13:26:01 +01:00 |
|
Jaime van Kessel
|
901c19e270
|
Prevent QML warning
CURA-6013
|
2018-12-12 11:52:04 +01:00 |
|
Jaime van Kessel
|
e30ca20c54
|
Merge branch '4.0' of github.com:Ultimaker/Cura into CURA-6013-rate-packages
|
2018-12-12 11:50:26 +01:00 |
|
Jaime van Kessel
|
dbf91fca7f
|
Re-added hover on showcase tiles
CURA-6013
|
2018-12-12 11:40:51 +01:00 |
|
alekseisasin
|
a505adbf40
|
Merge pull request #4945 from Ultimaker/CURA-6006-login-required
[4.0] CURA-6006 login required
|
2018-12-12 11:31:38 +01:00 |
|
alekseisasin
|
64104e47c6
|
Merge pull request #4970 from Ultimaker/fix_preview_stage_menu
Fix preview stage menu
|
2018-12-12 11:22:08 +01:00 |
|
Jaime van Kessel
|
5fd0f2b5f6
|
Add tooltip to rating if the rating is disabled
This makes it clearer what the user needs to do in order to rate (install package or login)
CURA-6013
|
2018-12-12 11:09:58 +01:00 |
|
Remco Burema
|
1b2ef91c13
|
Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0
|
2018-12-12 10:54:36 +01:00 |
|
Lipu Fei
|
a6663ea0e8
|
Fix typing issues
CURA-6005
|
2018-12-12 10:51:13 +01:00 |
|
Lipu Fei
|
f302a76d3a
|
Fix typing issue in Toolbox
CURA-6006
|
2018-12-12 10:47:18 +01:00 |
|