 Lipu Fei
|
a85f2ce156
Fix merge conflicts
|
5 лет назад |
|
Lipu Fei
|
4a171eebf6
Move models around again
|
5 лет назад |
|
Lipu Fei
|
f2d7f93101
Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action
|
5 лет назад |
|
Remco Burema
|
1f2fea14ce
Little refactors (apply review comments). [CURA-6294]
|
5 лет назад |
|
Remco Burema
|
ad6603bab8
Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip
|
5 лет назад |
|
Lipu Fei
|
c3c9c53f13
Merge WIP_onboarding
|
5 лет назад |
|
Lipu Fei
|
a97410656f
Fix WelcomePagesModel qml type registering typo
|
5 лет назад |
|
Lipu Fei
|
4078719c58
Move cura.Machine.Models to cura.UI.MachineModels
|
5 лет назад |
|
Lipu Fei
|
2b39d6422c
Move PrinterOutputDevice into cura.PrinterOutput module
|
5 лет назад |
|
Lipu Fei
|
1f5cf62a7c
Move UserChangesModel into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
e1d26da528
Move ExtrudersModel into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
5848174ad4
Move PrintInformation into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
228270d9d5
Move ObjectModel into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
dfc53d3604
Move MachineActionManager into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
8c0cb2b7b8
Move GlobalStackModel into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
b6216bf4a3
Move CuraSplashScreen into cura.UI module
|
5 лет назад |
|
Lipu Fei
|
a92971d80e
Merge WIP_boarding_by_ip
|
5 лет назад |
|
Lipu Fei
|
8d68db9ff0
WIP: Add first-start machine actions
|
5 лет назад |
|
Lipu Fei
|
d4c0104bc2
WIP: Add FirstStartMachineActionsModel
|
5 лет назад |
|
Lipu Fei
|
58062cb4de
WIP: Remove unused MachineManagementModel
|
5 лет назад |
|
Lipu Fei
|
987ebba33b
WIP: Make MachineSetting panel work
|
5 лет назад |
|
Remco Burema
|
5b31feebba
Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057]
|
5 лет назад |
|
Remco Burema
|
4a95564277
Only show Welcome-Pages when needed. [CURA-6057]
|
5 лет назад |
|
Remco Burema
|
0f116fa3f4
Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057]
|
5 лет назад |
|
Lipu Fei
|
2b0e9ea439
WIP: Fix refresh and naming
|
5 лет назад |
|
Lipu Fei
|
940a833e73
WIP: Add printers via network
|
5 лет назад |
|
Lipu Fei
|
ffb8aed4c3
Merge CURA-6179
|
5 лет назад |
|
Diego Prado Gesto
|
2ac2299c09
Merge branch 'master' into feature_model_list
|
5 лет назад |
|
Lipu Fei
|
ac012e8f09
WIP: Add Welcome Page and use CTRL+Alt+D to trigger
|
5 лет назад |
|
Jaime van Kessel
|
21c6bba1ce
Add the discovered printer functionality
|
5 лет назад |
|
Jaime van Kessel
|
efeba48ffb
Move initializeSettingDefinitions and setting functions to their own function
|
5 лет назад |
|
Diego Prado Gesto
|
3829eb0905
Add a preference check to enable or disable the experimental feature
|
5 лет назад |
|
Diego Prado Gesto
|
86c7d3e5ab
Add a object list panel instead of the open file button
|
5 лет назад |
|
Jaime van Kessel
|
c0d75b38b7
Added test to check if a key in the profile is defined in the definition
|
5 лет назад |
|
Ghostkeeper
|
5b9fb20b9a
Remove unused imports
|
5 лет назад |
|
fieldOfView
|
056655e584
Merge branch 'master' into feature_curaversion_appname
|
5 лет назад |
|
Jaime van Kessel
|
15563a756f
Merge branch '4.0' of github.com:Ultimaker/Cura
|
5 лет назад |
|
Jaime van Kessel
|
a41cc9efbe
Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura
|
5 лет назад |
|
Lipu Fei
|
3b3baeac03
Remove hard-coded account URLs in QMLs
|
5 лет назад |
|
Jaime van Kessel
|
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
|
5 лет назад |
|
Lipu Fei
|
b2dace2d48
Fix version upgrade
|
5 лет назад |
|
Diego Prado Gesto
|
c6da824203
Merge branch '4.0'
|
5 лет назад |
|
ChrisTerBeke
|
56f0a341bc
Fix merge conflicts
|
5 лет назад |
|
Remco Burema
|
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
|
5 лет назад |
|
ChrisTerBeke
|
764769f4bb
Merge branch '4.0' into STAR-322_cloud-connection
|
5 лет назад |
|
Remco Burema
|
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade
|
5 лет назад |
|
ChrisTerBeke
|
a6114d39e4
Fix merge conflicts with 4.0
|
5 лет назад |
|
Lipu Fei
|
059fede06e
Mkae default custom settings panel height smaller
|
5 лет назад |
|
Jaime van Kessel
|
d21bf53230
Add version upgrade for 4.0
|
5 лет назад |
|
Lipu Fei
|
f7fb04d4ae
Fix merge conflicts with 4.0
|
5 лет назад |
