ChrisTerBeke
c40d76f9ee
Fix formatting according to Cura code style
2018-12-03 23:13:24 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring
2018-12-03 22:12:18 +01:00
ChrisTerBeke
08e1b4691b
Remove TODO
2018-12-03 20:19:16 +01:00
ChrisTerBeke
8d6f109092
Set priority to 2
2018-12-03 20:11:53 +01:00
ChrisTerBeke
0852d2ebef
add one more TODO
2018-12-03 17:42:39 +01:00
ChrisTerBeke
d91efc656a
Add some more todo's for UI messages
2018-12-03 17:38:31 +01:00
ChrisTerBeke
90ec3f6cf9
Add TODO for progress messages
2018-12-03 17:22:21 +01:00
ChrisTerBeke
5db6bd9a9b
Send content type to API when uploading print job
2018-12-03 17:09:04 +01:00
Daniel Schiavini
2b8c9c17bb
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
2018-12-03 16:39:24 +01:00
Daniel Schiavini
186c2cf3f5
START-322: Python 3.5 compatibility
2018-12-03 16:35:51 +01:00
ChrisTerBeke
ddf958d39a
Fix typing in CloudOutputDevice
2018-12-03 16:23:44 +01:00
ChrisTerBeke
24b75d781e
Fix merge conflict
2018-12-03 15:58:25 +01:00
Daniel Schiavini
f8f6670cae
STAR-322: Letting models convert sub-models
2018-12-03 15:06:01 +01:00
Daniel Schiavini
fc26ccd6fa
STAR-332: Some improvements to get the job in connect
2018-12-03 14:41:36 +01:00
Daniel Schiavini
8066074a2f
STAR-332: Fixing warnings
2018-12-03 11:02:49 +01:00
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing
...
Cura 5943 ui usb printing
2018-12-03 10:42:58 +01:00
Diego Prado Gesto
e73a91e746
Merge branch 'master' into ui_rework_4_0
2018-12-02 12:11:12 +01:00
Jaime van Kessel
6ab2ce7690
Decrease padding between time & material specification headers
2018-11-30 16:44:55 +01:00
Jaime van Kessel
36a86adc0f
Remove spammy log
2018-11-30 16:08:19 +01:00
Marijn Deé
8b42b84618
Made a start with uploading jobs to the printer
2018-11-30 16:07:20 +01:00
Jaime van Kessel
ad26962cb9
Fix setting visibility not working in settingVisibilityPage
...
CURA-5981
2018-11-30 15:49:50 +01:00
Jaime van Kessel
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Jaime van Kessel
a4a619370e
Fix QML warnings
2018-11-30 15:33:57 +01:00
Jaime van Kessel
205b939b99
Merge branch 'remove_transitions' of github.com:Ultimaker/Cura
2018-11-30 15:30:53 +01:00
Jaime van Kessel
1a79372afd
Fixed name of cocoon create
...
For some reason it was added as if it was 2 machines at once. Since we already have a wanhao I3, i've changed this one to only be a profile for the Cocoon.
2018-11-30 15:16:37 +01:00
Jaime van Kessel
59a81be65c
Fixed some leftover graphical issues
...
CURA-5943
2018-11-30 14:10:42 +01:00
Jaime van Kessel
48bdb735f2
Added MachineSelector to monitor menu
...
CURA-5943
2018-11-30 13:58:44 +01:00
Jaime van Kessel
6d4a460e58
Move USB sidebar into the main view of the monitorstage
...
CURA-5943
2018-11-30 13:53:53 +01:00
Marijn Deé
763291821f
Added models to process the data from the api results
...
Added code to update the UI models
2018-11-29 17:03:11 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script'
2018-11-29 15:33:03 +01:00
Mark
90aa8c1264
point people to a good example
2018-11-29 15:29:51 +01:00
Lipu Fei
6db52dde46
Fix merge conflicts from ui_rework_40
...
CURA-5943
2018-11-29 15:27:06 +01:00
Lipu Fei
c545d9df77
Add key check before accessing in StartSliceJob
...
CURA-5901
2018-11-29 15:17:43 +01:00
Mark
d88a465737
Increase possible visible description lines in the Marketplace
2018-11-29 14:45:42 +01:00
Marijn Deé
8a72ba3cfa
Merge branch 'cloud-output-device' of github.com:Ultimaker/Cura into cloud-output-device
2018-11-29 10:00:57 +01:00
Lipu Fei
5df7cdde48
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-11-29 08:54:22 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace
...
Show website for support
2018-11-29 08:50:32 +01:00
Lipu Fei
b44ddec01f
Change normal layer height of cocoon to 0.10
...
CURA-5902
So it's different from Fine 0.15, otherwise you get duplicates.
2018-11-29 08:35:40 +01:00
Ian Paschal
1f17896e78
Merge pull request #4899 from Ultimaker/monitor_tab_scroll_tweak
...
Improve monitor tab temporary scroll bar
2018-11-28 13:24:27 +01:00
Ian Paschal
14cee32cec
Improve monitor tab temporary scroll bar
2018-11-28 12:20:09 +01:00
Jaime van Kessel
7d42fdf183
Add missing typing
2018-11-28 11:52:30 +01:00
Jaime van Kessel
0baa4d20b3
Gracefully handle the case where machine definition is no in the map
2018-11-28 11:42:54 +01:00
Jaime van Kessel
c0d1c35a2b
Removed accidental copy paste
2018-11-28 11:35:48 +01:00
Jaime van Kessel
adf16310c7
Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities
...
CURA-5879 experimental qualities
2018-11-28 11:34:21 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
...
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Diego Prado Gesto
fb152728e0
Merge branch 'master' into ui_rework_4_0
2018-11-28 11:19:43 +01:00
Jaime van Kessel
d9c3faaae2
Codestyle
...
CURA-5879
2018-11-28 11:19:37 +01:00
Jaime van Kessel
d09d8a6ae3
Minor codestyle fixes
...
CURA-5879
2018-11-28 11:18:36 +01:00
Jaime van Kessel
5ed2acadd0
Re-add wizard_progress size
...
I was a bit over enthosiastic deleting it as it was still used for the UMO first run wizard
2018-11-28 11:09:34 +01:00
Ian Paschal
9029d10ed0
Remove debug statement
...
Contributes to CL-1150
2018-11-28 10:47:34 +01:00
