3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 15:37:27 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
20047 commits 302 branches 270 tags 770 MiB
Commit graph

114 commits

Author SHA1 Message Date
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
Jaime van Kessel
14f96bd9b6 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-28 12:41:33 +02:00
Jaime van Kessel
63316fa4e9 Fix manual output devices not being added on boot 2019-05-28 11:59:17 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d, reversing
changes made to 7094b222b1.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Ian Paschal
c7f6351903 Add typings 
Contributes to CL-1331
 2019-05-15 10:09:27 +02:00
Ian Paschal
c4ca133b40 Update UM3OutputDevicePlugin.py 
Contributes to CL-1331
 2019-05-13 15:39:29 +02:00
Ian Paschal
8b25816b1b Fix typo and white space 
Contributes to CL-1331
 2019-05-13 14:44:39 +02:00
Ian Paschal
20a9b65ea5 Use API endpoint for machine association 
Contributes to CL-1331 and CL-1323
 2019-05-09 14:54:24 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request 
CURA-6483
 2019-04-25 11:55:49 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Ian Paschal
17a5816b88 Fix typing 
Contributes to CL-1325
 2019-04-11 10:12:27 +02:00
Ian Paschal
61c38c5ec0 Pass output device (or not) to cloud check method 
Contributes to CL-1325
 2019-04-10 15:43:44 +02:00
Lipu Fei
086ae1c735 Make sure the unsuccessful manual device gets removed 
CURA-6057
 2019-04-08 12:27:32 +02:00
Lipu Fei
5074cf69dd Fix typing 
CURA-6435
 2019-04-05 09:57:58 +02:00
Jaime van Kessel
932a5c8fc9 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura 2019-04-04 14:38:18 +02:00
Lipu Fei
ffce5b8d58 FixassociateActiveMachineWithPrinterDevice() 
CURA-6057
 2019-04-03 12:10:09 +02:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Ian Paschal
2233543780 Only set "do not show cloud message" metadata if active machine is the added cloud cluster 
Contributes to CL-1267
 2019-03-22 14:53:55 +01:00
Lipu Fei
ec0b197b6e Fix merge conflicts 2019-03-22 14:28:23 +01:00
Remco Burema
b25df557d3 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-22 13:20:43 +01:00
Lipu Fei
80dff49b8a Fix merge conflicts 2019-03-22 10:00:57 +01:00
Lipu Fei
f90fd8aee8 Add typing 2019-03-22 09:50:32 +01:00
Lipu Fei
b1620f1912 Fix typing 2019-03-22 09:49:40 +01:00
Remco Burema
8250c91fc4 Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294] 2019-03-21 18:45:57 +01:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip 
'WIP-onboarding-by-ip' into 'parent' branch
 2019-03-21 09:52:39 +01:00
Lipu Fei
aa1ad9a93d Fix merge conflicts 2019-03-21 09:31:24 +01:00
Lipu Fei
85a3b54111 Merge WIP_onboarding 2019-03-21 09:21:56 +01:00
Lipu Fei
cf5fd1c355 Fix typing 2019-03-21 09:13:00 +01:00
Lipu Fei
a17642a5a1 Merge WIP_onboarding_by_ip 2019-03-20 13:42:15 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +01:00
Lipu Fei
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Remco Burema
740dd095cc (Add-by-IP) Incorporated review comments. [CURA-6294] 2019-03-19 13:45:56 +01:00
Ghostkeeper
3e9ed0fbfa
Add translation hint for untranslatable Ultimaker Cloud brand 
So that the translators next time hopefully won't translate this.

Contributes to issue CURA-6257.
 2019-03-18 10:36:23 +01:00
Remco Burema
2693eecd33 (Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294] 2019-03-14 13:33:24 +01:00
Remco Burema
61821e6378 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip 2019-03-14 11:40:44 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Remco Burema
b12b6892ca Add-by-IP onboarding: Create (and set active) new device. [CURA-6294] 2019-03-13 17:36:03 +01:00
Remco Burema
bb17ab14da (WIP) Connect manual-device-added signals to AddPrinterByIP-page. [CURA-6294] 2019-03-13 15:46:02 +01:00
Lipu Fei
e5b51c8edf WIP: Implement refreshConnections() 2019-03-13 15:34:18 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
Lipu Fei
6b2642ee9a Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-11 09:05:43 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Remco Burema
6d34a2abd0 Start to connect/handle new signals for manual device addition. [CURA-6294] 2019-03-08 13:08:44 +01:00
Remco Burema
7a7e710b2a Support for manual device addition for plugins (WIP). [CURA-6294] 2019-03-06 17:50:40 +01:00
Ian Paschal
9c3f67a9ed Code style 
Contributes to CL-1272
 2019-03-06 12:26:38 +01:00