Remco Burema
7a7e710b2a
Support for manual device addition for plugins (WIP). [CURA-6294]
2019-03-06 17:50:40 +01:00
Remco Burema
48cc9b3c1d
Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip
2019-03-06 14:08:41 +01:00
Remco Burema
5f335b4401
Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding
2019-03-06 14:07:44 +01:00
Remco Burema
3c0583bef0
[AddPrinterByIp] Finish GUI as a facade first for review. [CURA-6057]
2019-03-06 14:05:42 +01:00
Lipu Fei
ffb8aed4c3
Merge CURA-6179
2019-03-06 11:32:52 +01:00
Lipu Fei
9968a79863
Merge remote-tracking branch 'origin/master' into WIP_onboarding
2019-03-06 11:29:56 +01:00
Ghostkeeper
76d9503777
Replace travel_speed with speed_travel
...
The setting key was renamed in version 15.6.
2019-03-05 17:43:00 +01:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys
...
This is both faster and actually functions properly.
Contributes to issue CURA-6272.
2019-03-05 15:25:39 +01:00
Ghostkeeper
a7f9fc5f6b
Add contribution guidelines
...
Gets us one step closer to maintaining a good community according to the FSF.
2019-03-05 14:24:31 +01:00
Remco Burema
c1cde2ebc0
Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding
2019-03-05 14:15:17 +01:00
Lipu Fei
56060b1e64
WIP: Add add printer page, network part
2019-03-05 12:06:51 +01:00
Ghostkeeper
c665a481dd
Show settings that influence draft/ooze shields if enabled
...
The skirt/brim speeds currently affect the draft and ooze shields. So if the draft or ooze shield is enabled, show those settings.
Contributes to #5373 .
2019-03-05 10:45:25 +01:00
Jaime van Kessel
6157cb6f91
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-03-04 16:00:56 +01:00
Ian Paschal
11ea568d0b
Merge pull request #5370 from Ultimaker/CL-1247_hide_view_prints_button_on_cloud
...
CL-1247 Hide the "View print history" button when connecting via cloud
2019-03-04 11:40:48 +01:00
Diego Prado Gesto
3fd0561aca
Update the ExtruderModel
...
also when the variant container has changed.
Contributes to CURA-6227.
2019-03-01 14:54:42 +01:00
Diego Prado Gesto
0e7127f80b
Merge branch 'master' of github.com:Ultimaker/Cura
2019-03-01 14:54:10 +01:00
Remco Burema
113c37f555
Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057]
2019-03-01 13:17:15 +01:00
Satish
c98a73f8fd
Added id's to printer button, installed plugins, material fields and profile tab for integration tests
2019-03-01 12:47:29 +01:00
Diego Prado Gesto
3f8f363836
Fix the installed checkmark in Marketplace
...
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
2019-03-01 10:57:39 +01:00
Simon Edwards
4590fae9b2
Hide the "View print history" button when connecting via cloud
...
CL-1247
2019-02-28 17:08:28 +01:00
Mark
eccfebf39d
Update material packages for 4.0 release
2019-02-28 16:11:51 +01:00
Jaime van Kessel
38a9206898
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3
Don't drop refresh token if request failed
2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f
Prevent crash if the connection was lost for auth token
2019-02-28 12:58:41 +01:00
Jaime van Kessel
1c7e047a38
Added tests for adding & removing discovered devices
...
CURA-6179
2019-02-28 09:47:25 +01:00
Jaime van Kessel
bbe1b1590a
Added test for adding & creating machine with discovered printer
...
CURA-6179
2019-02-28 09:35:16 +01:00
Lipu Fei
6ebfaff61e
WIP: Fixes and add cloud page
2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538
WIP: dos2unix new files
2019-02-28 08:07:44 +01:00
Lipu Fei
51c773fd80
WIP: Make reusable widget CuraProgressBar
2019-02-28 08:06:28 +01:00
Lipu Fei
92730a09a2
WIP: Add data collections page
2019-02-28 07:48:05 +01:00
Lipu Fei
72866683e6
WIP: Add Whats new page
2019-02-27 16:00:45 +01:00
Ghostkeeper
b723beb435
Pre-heat to initial layer temperature instead of normal temperature
...
Because that's what it's going to start printing with.
2019-02-27 15:58:30 +01:00
Ghostkeeper
970fa69166
Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2
2019-02-27 15:55:57 +01:00
Ghostkeeper
470871a0d2
Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master
2019-02-27 15:31:57 +01:00
Lipu Fei
14fdf68871
WIP: Add User Agreement page and fixes
2019-02-27 15:28:39 +01:00
Lipu Fei
ac012e8f09
WIP: Add Welcome Page and use CTRL+Alt+D to trigger
2019-02-27 12:45:28 +01:00
Lipu Fei
3b63f92d55
WIP: Add base QMLs for WelcomeDialog
2019-02-27 12:45:28 +01:00
Jaime van Kessel
17fdc86e50
Fix typing
...
CURA-6179
2019-02-27 11:59:50 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0'
2019-02-27 11:47:47 +01:00
Ghostkeeper
9fba8f5381
Update metadata of translation templates
...
It's now 2019, and Cura 4.0.
Contributes to issue CURA-6257.
2019-02-27 11:47:29 +01:00
Jaime van Kessel
21c6bba1ce
Add the discovered printer functionality
...
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).
This means we can select one of those printers and directly add it (thus no longer needing that step)
CURA-6179
2019-02-27 11:05:54 +01:00
Jaime van Kessel
7ed1ee4365
Merge pull request #5365 from Ultimaker/fix-token-expiry
...
Fix token expiry
2019-02-27 10:56:00 +01:00
ChrisTerBeke
9ba342c541
Fix codestyle failure on float conversion
2019-02-27 10:43:15 +01:00
ChrisTerBeke
365f67cbf8
Have some overlap in token expiry to prevent unauthorized issues
2019-02-27 10:32:30 +01:00
Ghostkeeper
c44a207744
Remove duplicate property
...
I think this is the result of a merge conflict or something. This entry should not be dependent on the number of bottom layers so I'm keeping the first one.
2019-02-27 10:23:46 +01:00
Ghostkeeper
e2adc1791f
Merge branch '4.0'
2019-02-26 17:08:30 +01:00
Ghostkeeper
bedb52fb60
Update translation templates for every language
...
This way the translators can simply fill in the blanks.
Contributes to issue CURA-6257.
2019-02-26 16:54:50 +01:00
Ghostkeeper
fbbadc4543
Update translation templates for Cura 4.0
...
These are the new strings that will now have to be translated.
Contributes to issue CURA-6257.
2019-02-26 16:53:34 +01:00
Daniel Green
bfa13e6146
Merge branch 'master' of github.com:radfahrer/Cura
2019-02-26 07:25:42 -08:00
Daniel Green
5219b1ff9b
Removes unnecessary fields.
2019-02-26 07:21:46 -08:00
