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
Jaime van Kessel
3774fdbd02
Refactored the "connection_type" metadata entry so it can support multiple types.
...
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
ChrisTerBeke
7c7bca31c7
Fix renamed property connectionType
2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4
Fix merge conflicts with 4.0
2019-01-08 11:49:36 +01:00
Jaime van Kessel
4c1f68a447
Ensure that the connectiontype of a connected printer is set correctly
...
CURA-6011
2019-01-04 15:24:01 +01:00
ChrisTerBeke
5e9fe3fe50
Fix some codestyle, make connectionType a property as it's needed in QML
2018-12-19 11:21:50 +01:00
ChrisTerBeke
25caf1a087
Fix merge conflicts
2018-12-18 14:44:13 +01:00
Jaime van Kessel
84a7f2e5a2
Fix review comments
...
CURA-6011
2018-12-18 09:40:08 +01:00
Jaime van Kessel
226d052468
Move the machines from machinelist into their own model
...
CURA-6011
2018-12-14 17:10:58 +01:00
Daniel Schiavini
4dc8edb996
STAR-322: Fixing the multipart upload
2018-12-14 12:48:40 +01:00
Daniel Schiavini
01e443049f
STAR-322: Creating a subclass for connect devices
2018-12-05 10:37:58 +01:00
ChrisTerBeke
24b75d781e
Fix merge conflict
2018-12-03 15:58:25 +01:00
Jaime van Kessel
36a86adc0f
Remove spammy log
2018-11-30 16:08:19 +01:00
ChrisTerBeke
269d596f5d
Fix typing for cluster list
2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7
Cleanup plugin imports
2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982
Use BaseModel for CloudCluster, some fixes
2018-11-26 14:51:24 +01:00
ChrisTerBeke
014b1d6e4e
test
2018-11-26 13:45:37 +01:00
ChrisTerBeke
1adf1096a3
Merge branch 'master' into cloud-output-device
2018-11-23 14:17:26 +01:00
ChrisTerBeke
3e100775df
Fix instantiating CloudOutputDeviceManager
2018-11-23 14:14:35 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
...
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
ChrisTerBeke
10576d1242
Some scaffolding and implementation for cloud output device manager
2018-11-19 22:24:35 +01:00
ChrisTerBeke
228325eb89
Add CloudOutputDeviceManager, test implementation
2018-11-19 21:59:57 +01:00
Jaime van Kessel
c15f8aa693
Move printer type checking to where it belongs; inside the UM3 plugin.
2018-09-27 15:54:23 +02:00
Ian Paschal
18e0dacda4
Organize files better
...
First things first... organize!
2018-09-07 14:11:37 +02:00
