3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
17030 commits 302 branches 270 tags 773 MiB
Commit graph

281 commits

Author SHA1 Message Date
ChrisTerBeke
15ef3d1d10 Merge branch 'master' into feature-backup-manager 2018-05-18 17:27:05 +02:00
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Jack Ha
fd73751b91 Make the ToolboxProgressButton labels actually overrideable 2018-05-15 16:10:01 +02:00
ChrisTerBeke
4e90e6c2e3 Merge branch 'master' into feature-backup-manager 2018-05-15 14:05:58 +02:00
ChrisTerBeke
bb94ad904a fix 2018-05-15 14:05:40 +02:00
ChrisTerBeke
b7f26ddcc7 Small code improvements 2018-05-15 13:29:01 +02:00
ChrisTerBeke
c9145c6661 Small code improvements 2018-05-15 13:28:33 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Ian Paschal
d30bbd48fb CURA-5296 
- Changed API to not use staging
- Fixed crash when pressing cancel
- Added loading icon
 2018-05-15 12:53:05 +02:00
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
ChrisTerBeke
8707d12bf3 Show package version in installed tab 2018-05-15 11:28:00 +02:00
ChrisTerBeke
abcf7bd187 Show package version in installed tab 2018-05-15 11:25:56 +02:00
ChrisTerBeke
0617a95cd0 Add API root as cura version variable 2018-05-15 11:13:27 +02:00
Jack Ha
c54957540b Merge branch 'master' into bugfix-toolbox-update 2018-05-15 09:45:14 +02:00
Jack Ha
fccfff14bc Now using api.ultimaker.com instead of api-staging.ultimaker.com 2018-05-15 09:44:58 +02:00
Jack Ha
1f088aabc4 Cleanup and simplify toolbox plugin update 2018-05-14 16:11:44 +02:00
Jack Ha
0f0b6a9712 Fix/Implement update in toolbox 2018-05-14 16:01:59 +02:00
Diego Prado Gesto
04534936c3 CURA-5358 Change the name in the dict to search for the 'qualities' that 
are inside a curapackage.
 2018-05-14 11:36:19 +02:00
Diego Prado Gesto
0bb82f144b Make the toolbox window not resizable. 2018-05-14 10:16:18 +02:00
Diego Prado Gesto
527f269b5d Fix an issue that kept the plugins in the "installed" list despite of 
already being removed from the data folder.
 2018-05-11 16:32:31 +02:00
Diego Prado Gesto
fa97d5830b Fix some crashes and issues in the Toolbox when working with no 
internet connection.
 2018-05-11 15:23:40 +02:00
Diego Prado Gesto
675b5b1997 Use the application language for the dates 2018-05-11 14:47:56 +02:00
Diego Prado Gesto
418bedc8f0 Small fixes and change the "plugins" text to "packages" 2018-05-11 14:10:53 +02:00
Diego Prado Gesto
806b1f707f Change layout of the installed plugins tab. 
- There were some alignment problems when there were more than 2 buttons
in a column (disable, uninstall and update)
- Now the progress bar shows on top of the "Update" button.
 2018-05-11 14:03:28 +02:00
Ian Paschal
3dda3f04fb CURA-5296 Improvement to using CuraVersion 2018-05-10 08:42:14 +02:00
Ian Paschal
20a2ea4f2c CURA-5296 Don't crash if no CuraVersion 2018-05-09 17:09:21 +02:00
Jack Ha
b17685d075 CURA-5296 fix model property mismatch 2018-05-09 13:59:45 +02:00
Ian Paschal
4b931326fd CURA-5296 Set packages version with super secret method 2018-05-08 15:04:19 +02:00
Ian Paschal
0accdc6320 Cura-5296 Use separate packages.json files in app and user data 2018-05-08 11:54:19 +02:00
Diego Prado Gesto
58289a7b45 Remove useful comment 2018-05-04 17:28:39 +02:00
Diego Prado Gesto
2283bb530d CURA-4644 Fix unselectable item in the Toolbox 2018-05-04 15:49:37 +02:00
Ian Paschal
858108920a
Merge pull request #3765 from fieldOfView/fix_toolbox_appearance 
Fix toolbox appearance
 2018-05-04 14:25:01 +02:00
Diego Prado Gesto
b00d51a6eb CURA-4644 Set the property in the component where is being used. 2018-05-04 14:03:26 +02:00
Diego Prado Gesto
6b214d2443 CURA-4644 Change the return type to QObject 2018-05-04 13:05:29 +02:00
fieldOfView
4e305079ec Simplify 2018-05-04 11:42:45 +02:00
fieldOfView
1f675f505f Tweak margins 2018-05-04 10:42:03 +02:00
fieldOfView
89322b9db6 Move toolbox button style into theme 2018-05-04 10:41:45 +02:00
Jaime van Kessel
7d2257838b Added missing typing 2018-05-03 20:42:06 +02:00
Jaime van Kessel
7665f8a7cb Reading packages from archive now uses With context 2018-05-03 20:22:38 +02:00
ChrisTerBeke
b62b682570 Make Qt network redirects work in both 5.8 and 5.9+ 2018-05-03 13:33:32 +02:00
Diego Prado Gesto
7850f5a18e Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-03 09:30:29 +02:00
Diego Prado Gesto
65a6c751cd Change attribute of the download request to follow redirects. That makes the download feature of the Toolbox compatible with Qt 5.8.2. 2018-05-03 09:29:04 +02:00
fieldOfView
c2c5228eee Fix plugin details 
Previous fix for QML warnings broke the details display.
 2018-05-02 23:19:13 +02:00
fieldOfView
685b80fc3a Fix more QML warnings 2018-05-02 21:56:23 +02:00
fieldOfView
0aadaa3c9d Merge branch 'master' into fix_toolbox_appearance 
# Conflicts:
#	plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
 2018-05-02 20:37:33 +02:00
fieldOfView
ca8b7bb1da Fix QML warnings 2018-05-02 20:34:50 +02:00