Jaime van Kessel
39072a1498
Merge branch 'master' of github.com:Ultimaker/Cura
2019-04-18 09:29:36 +02:00
Jaime van Kessel
48f37d03a4
Add debug log for when we are refreshing the access token
2019-04-18 09:29:04 +02:00
Lipu Fei
427cfdc4b2
Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine
2019-04-18 07:53:13 +02:00
Jaime van Kessel
849e968edb
Merge branch 'master' of github.com:Ultimaker/Cura
2019-04-17 16:12:02 +02:00
Jaime van Kessel
d8f193870f
Added more logging to the authorization service
2019-04-17 16:11:39 +02:00
Remco Burema
d72911df84
Merge branch 'master' into CURA-6435_new_style_add_machine
2019-04-17 14:00:45 +02:00
Lipu Fei
47f9741d9d
Sort network printer names in list
...
CURA-6449
2019-04-17 13:35:40 +02:00
Remco Burema
4c214f5b2d
Merge pull request #5611 from Ultimaker/CURA-6449_fix_non_host_printers
...
CURA-6449 Disable printers that are not host of a group
2019-04-17 13:06:38 +02:00
Jaime van Kessel
ef92aad6bb
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine
2019-04-17 11:06:30 +02:00
Jaime van Kessel
f2044998ae
Merge pull request #5604 from Ultimaker/CURA-6447_fix_start_onboarding
...
CURA-6447 Fix start onboarding
2019-04-17 10:59:23 +02:00
Lipu Fei
46fa45768a
Simplify shouldShowWelcomeDialog()
...
CURA-6447
2019-04-17 09:35:01 +02:00
Lipu Fei
ce5682aa74
Check type by ID in isUnknownMachineType()
...
CURA-6449
2019-04-17 09:32:34 +02:00
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs'
2019-04-16 16:29:14 +02:00
Ghostkeeper
325e60d821
Correct renamed welcome check function
...
Contributes to issue CURA-6435.
2019-04-16 15:28:32 +02:00
Jaime van Kessel
c2a00d6b53
Fix copy paste error
...
Simple fix that caused crash for getHasVariantBuildplates
2019-04-16 10:53:06 +02:00
Jaime van Kessel
8267ef670a
Greatly decrease amount of tickles to the backend for settingOverrideDecorator
2019-04-15 17:59:27 +02:00
Jaime van Kessel
abb13e8992
Prevend unneeded tickles of the backend for setting override decorators
2019-04-15 17:52:13 +02:00
Jaime van Kessel
e8d2e070d8
Dont calculate bounding box for non printing meshes
...
Fixes #5603
2019-04-15 17:46:54 +02:00
Jaime van Kessel
42b1a0e028
Refactor some small bits of the setting override decorator
...
There was code duplication and a number of functions that should be private
contributes to #5603
2019-04-15 17:36:55 +02:00
Lipu Fei
8e579d2d68
Update default extruder when applying remote config
...
CURA-6452
2019-04-15 13:25:24 +02:00
Lipu Fei
0fe6555881
Remove debug code
...
CURA-6447
2019-04-15 13:09:44 +02:00
Lipu Fei
d9018220b5
Merge branch 'master' into CURA-6449_fix_non_host_printers
2019-04-15 11:37:02 +02:00
Lipu Fei
ba37812793
Correct some deprecations and remove duplicated code
2019-04-15 09:47:09 +02:00
Lipu Fei
5f7f7f944f
Remove use XYZ instead
2019-04-15 09:39:05 +02:00
Diego Prado Gesto
d0aee9da3f
Merge branch 'master' into CURA-6447_fix_start_onboarding
2019-04-12 16:39:51 +02:00
Remco Burema
d3310be846
Deprecate some MachineManagaer functions.
...
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!
part of CURA-6457
2019-04-12 16:19:54 +02:00
Diego Prado Gesto
969b5f7081
Merge branch 'master' into CURA-6435_new_style_add_machine
2019-04-12 16:15:36 +02:00
Diego Prado Gesto
82b7817fc6
Merge pull request #5616 from Ultimaker/CURA-6057_fix_onboarding
...
Latest commits to onboarding
2019-04-12 16:00:11 +02:00
Remco Burema
367a12557f
Filter placeholders-devices: but use parseBool instead. [CURA-6057]
2019-04-12 13:14:35 +02:00
Remco Burema
c5f4b30264
Don't show 'discovered' machines that are placeholders. [CURA-6057]
2019-04-12 13:01:39 +02:00
Lipu Fei
6383c77473
Fix section text
...
CURA-6449
2019-04-12 12:25:38 +02:00
Lipu Fei
26205fbdce
Remove translation for Unknown printer type
...
CURA-6449
2019-04-12 12:23:24 +02:00
Lipu Fei
9494173f43
Remove hack in WelcomePagesModel and add WhatsNewPagesModel
...
CURA-6447
2019-04-12 12:11:09 +02:00
Lipu Fei
e0e3c9609f
Fix update should show logic
...
CURA-6447
2019-04-12 09:56:45 +02:00
Lipu Fei
32fcc79dd8
Fix _shouldResolve()
...
CURA-6456
2019-04-11 16:34:57 +02:00
Lipu Fei
588dd6cd78
Disable printers that are not host of a group
...
CURA-6449
- Group printers into hosts and non-hosts and of unknown type.
- Show available/connectable printers first in the list.
- Show sections for connectable and non-connectable printers.
2019-04-11 11:33:01 +02:00
Lipu Fei
01c0fe1ffb
Fix update should show logic
...
CURA-6447
2019-04-10 10:52:11 +02:00
Lipu Fei
b692787def
Fix how onboarding flow is shown
...
CURA-6447
2019-04-10 07:16:09 +02:00
Lipu Fei
61ee2ec85c
Simplify code
...
CURA-6447
2019-04-09 11:45:30 +02:00
Lipu Fei
f94344263b
Fix merge conflicts
2019-04-09 11:33:07 +02:00
Lipu Fei
ad51d8f1b6
Show readable machine type in add by ip page
...
CURA-6057
2019-04-08 13:06:30 +02:00
Jaime van Kessel
e1804e0a47
Merge branch 'CURA-5930_switch_to_first_enabled_extruder' of github.com:Ultimaker/Cura
2019-04-08 11:37:19 +02:00
Jaime van Kessel
8fb3a73c3a
Use boundingBoxChanged signal to recompute convex hull
...
The boundingbox is the signal we should be listening for, since it does the same as the
previous ones (and more!). This also fixes the issue that group nodes didn't get their
convex hull set correctly on first creation
CURA-6416
2019-04-08 09:40:38 +02:00
Lipu Fei
dfa35bd589
Fix goToPage() when page_id is not found
...
CURA-6435
2019-04-08 09:20:24 +02:00
Lipu Fei
7d096e5734
Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine
2019-04-08 09:09:07 +02:00
Jaime van Kessel
fe14024620
Move existNetworkInstances into discover action
2019-04-05 17:49:29 +02:00
Jaime van Kessel
5b818d203a
Move a bunch of network only functions out of machine manager
...
Machine manager is way to big as is, so we need to move more code out of it to
locations where the code is actually used.
2019-04-05 17:45:19 +02:00
Lipu Fei
3adf7d49d0
Switch to the first enabled extruder after setActiveMachine
...
CURA-5930
2019-04-05 10:51:09 +02:00
Lipu Fei
a18bb9d953
Add AddPrinterPagesModel
...
CURA-6435
2019-04-05 09:09:00 +02:00
Lipu Fei
0f62f0c60a
Add next_page_button_text field to WelcomePagesModel
...
CURA-6435
2019-04-05 09:09:00 +02:00