Ghostkeeper
d6143103d0
Merge branch 'marketplace_redesign' into CURA-8565_marketplace_plugin_details
...
Conflicts:
plugins/Marketplace/resources/qml/Marketplace.qml -> Whole layout changed, while the onboarding banner got added. I re-added the onboarding banner item and the new search link at locations where I thought it was appropriate.
plugins/Marketplace/resources/qml/Packages.qml -> A small conflict where new properties got added while I moved the width property up a bit for consistency. Easy enough to fix.
2021-11-30 16:16:20 +01:00
..
2021-07-27 11:54:43 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-07-28 08:45:42 +02:00
2021-09-24 16:17:12 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-11-12 11:49:37 +01:00
2021-07-29 11:40:11 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-09-07 11:33:54 -04:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-11-30 16:16:20 +01:00
2021-07-27 11:54:43 +02:00
2021-08-31 12:07:11 +02:00
2021-10-08 13:35:01 +02:00
2021-10-16 11:45:48 +02:00
2021-07-21 14:13:50 +02:00
2021-07-07 11:36:10 +02:00
2021-09-07 11:33:54 -04:00
2021-06-17 11:15:33 +02:00
2021-09-07 11:34:22 -04:00
2021-10-06 16:19:31 +02:00
2021-07-27 11:54:43 +02:00
2021-06-28 17:16:56 +02:00
2021-10-04 14:31:25 +02:00
2021-06-17 11:15:33 +02:00
2021-09-17 15:15:25 +02:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-10-05 13:54:13 +02:00
2021-09-07 11:33:54 -04:00
2021-09-24 16:32:38 +02:00
2021-09-07 11:33:54 -04:00
2021-06-17 11:15:33 +02:00
2021-06-17 11:15:33 +02:00
2021-07-27 11:08:01 +02:00