asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
2,201 Commits 2 Branches 0 Tags
2a723dcd4fb0074e7d34286c231ef248e907b1c4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
olivermrbl 6663a6290b chore(release): Publish 2022-08-04 14:12:54 +02:00
olivermrbl bc7c2d9c4a chore(release): Publish 2022-08-03 18:34:24 +02:00
olivermrbl 77ef28d274 Merge branch 'master' into develop 2022-08-03 18:03:14 +02:00
olivermrbl 1dec44287d chore: Add changeset to version bump packages missing changesets 2022-08-02 13:18:01 +02:00
olivermrbl cf167d00b1 chore(release): Publish 2022-07-12 09:38:54 +02:00
olivermrbl e324f223d7 chore: Add .env to .gitignore 2022-07-12 09:36:04 +02:00
olivermrbl fb0346f1fa fix: Merge conflicts 2022-07-12 09:29:41 +02:00
olivermrbl 76cc10335f Merge branch 'master' into develop 2022-07-05 10:19:13 +02:00
olivermrbl 915359d84b chore: fix yarn.lock conflicts 2022-07-05 10:17:09 +02:00
olivermrbl 6b2a43abf1 chore(release): Publish 
- medusa-dev-cli@0.0.26
 2022-07-05 09:59:58 +02:00
olivermrbl f87c268913 chore(release): Publish 
- @medusajs/medusa-cli@1.3.1
 - medusa-dev-cli@0.0.25
 - medusa-file-minio@1.0.7
 - medusa-file-s3@1.1.3
 - medusa-file-spaces@1.2.3
 - medusa-fulfillment-webshipper@1.3.3
 - medusa-interfaces@1.3.1
 - @medusajs/medusa-js@1.2.3
 - medusa-payment-paypal@1.2.3
 - medusa-payment-stripe@1.1.41
 - medusa-plugin-algolia@0.2.3
 - medusa-plugin-brightpearl@1.3.1
 - medusa-plugin-contentful@1.2.3
 - medusa-plugin-ip-lookup@1.2.1
 - medusa-plugin-mailchimp@1.1.42
 - medusa-plugin-meilisearch@0.2.3
 - medusa-plugin-sendgrid@1.3.3
 - medusa-plugin-slack-notification@1.3.3
 - medusa-plugin-twilio-sms@1.2.3
 - medusa-react@0.3.3
 - medusa-source-shopify@1.2.1
 - @medusajs/medusa@1.3.3
 2022-07-05 09:51:23 +02:00
olivermrbl 1ee7691c2b Merge branch 'master' into develop 2022-06-19 13:12:21 +02:00
olivermrbl 8e43ef2b3a chore(release): Publish 
- medusa-file-minio@1.0.6
 - medusa-file-s3@1.1.2
 - medusa-file-spaces@1.2.2
 - medusa-fulfillment-webshipper@1.3.2
 - @medusajs/medusa-js@1.2.2
 - medusa-payment-paypal@1.2.2
 - medusa-payment-stripe@1.1.40
 - medusa-plugin-algolia@0.2.2
 - medusa-plugin-contentful@1.2.2
 - medusa-plugin-mailchimp@1.1.41
 - medusa-plugin-meilisearch@0.2.2
 - medusa-plugin-sendgrid@1.3.2
 - medusa-plugin-slack-notification@1.3.2
 - medusa-plugin-twilio-sms@1.2.2
 - medusa-react@0.3.2
 - @medusajs/medusa@1.3.2
 2022-06-19 13:11:05 +02:00
olivermrbl c85ef984cc Merge branch 'master' into develop 2022-06-19 12:59:08 +02:00
olivermrbl ee9fb8324c Merge branch 'master' into develop 2022-06-16 13:25:45 +02:00
olivermrbl 34f3d1c242 Merge branch 'master' into develop 2022-06-15 13:47:38 +02:00
olivermrbl 6c1a722b38 chore(release): Publish 
- medusa-file-minio@1.0.5
 - medusa-file-s3@1.1.1
 - medusa-file-spaces@1.2.1
 - medusa-fulfillment-webshipper@1.3.1
 - @medusajs/medusa-js@1.2.1
 - medusa-payment-paypal@1.2.1
 - medusa-payment-stripe@1.1.39
 - medusa-plugin-algolia@0.2.1
 - medusa-plugin-contentful@1.2.1
 - medusa-plugin-mailchimp@1.1.40
 - medusa-plugin-meilisearch@0.2.1
 - medusa-plugin-sendgrid@1.3.1
 - medusa-plugin-slack-notification@1.3.1
 - medusa-plugin-twilio-sms@1.2.1
 - medusa-react@0.3.1
 - @medusajs/medusa@1.3.1
 2022-05-31 09:12:18 +02:00
olivermrbl a8330003d9 Merge branch 'master' into develop 2022-05-31 08:41:57 +02:00
olivermrbl d4470b0c4a Merge branch 'master' into develop 2022-05-30 09:49:05 +02:00
olivermrbl a777e28282 chore: update yarn.lock 2022-05-30 09:48:50 +02:00
olivermrbl a33c1cfb14 chore: Update yarn.lock 2022-05-24 10:09:45 +02:00
olivermrbl ad85bd0006 Merge branch 'master' into develop 2022-05-24 10:02:35 +02:00
olivermrbl 7700b28e8d Merge branch 'master' into develop 2022-05-19 08:51:41 +02:00
olivermrbl 847508af02 Merge branch 'master' into develop 2022-05-17 15:04:35 +02:00
olivermrbl 4198ee7756 Merge branch 'master' into develop 2022-05-13 14:32:24 +02:00
olivermrbl ae5801c518 chore(release): Publish 
- gatsby-source-medusa@0.1.0
 - @medusajs/medusa-cli@1.3.0
 - medusa-file-s3@1.1.0
 - medusa-file-spaces@1.2.0
 - medusa-fulfillment-webshipper@1.3.0
 - medusa-interfaces@1.3.0
 - @medusajs/medusa-js@1.2.0
 - medusa-payment-klarna@1.3.0
 - medusa-payment-paypal@1.2.0
 - medusa-plugin-add-ons@1.2.0
 - medusa-plugin-algolia@0.2.0
 - medusa-plugin-brightpearl@1.3.0
 - medusa-plugin-contentful@1.2.0
 - medusa-plugin-ip-lookup@1.2.0
 - medusa-plugin-meilisearch@0.2.0
 - medusa-plugin-segment@1.3.0
 - medusa-plugin-sendgrid@1.3.0
 - medusa-plugin-slack-notification@1.3.0
 - medusa-plugin-twilio-sms@1.2.0
 - medusa-react@0.3.0
 - medusa-source-shopify@1.2.0
 - @medusajs/medusa@1.3.0
 2022-05-01 15:16:35 +02:00
olivermrbl d0675dc8b5 fix: merge conflicts 2022-05-01 14:58:28 +02:00
olivermrbl d7971ba604 fix: merge conflicts with master 2022-04-27 14:21:03 +02:00
olivermrbl 6b34a9adab Merge branch 'master' into develop 2022-03-04 16:56:58 +01:00
olivermrbl 6c010c019f chore(release): Publish 
- @medusajs/medusa-cli@1.2.1
 - medusa-fulfillment-webshipper@1.2.1
 - medusa-interfaces@1.2.1
 - @medusajs/medusa-js@1.1.1
 - medusa-payment-klarna@1.2.1
 - medusa-payment-paypal@1.1.1
 - medusa-plugin-algolia@0.1.1
 - medusa-plugin-brightpearl@1.2.1
 - medusa-plugin-meilisearch@0.1.1
 - medusa-plugin-segment@1.2.1
 - medusa-plugin-sendgrid@1.2.1
 - medusa-plugin-slack-notification@1.2.1
 - medusa-react@0.2.1
 - medusa-source-shopify@1.1.1
 - @medusajs/medusa@1.2.1
 2022-02-28 16:57:42 +01:00
olivermrbl 562a1b427a fix: merge conflicts 2022-02-25 18:55:44 +01:00
olivermrbl 806c42650c chore(release): Publish 
- @medusajs/medusa-cli@1.2.0
 - medusa-fulfillment-webshipper@1.2.0
 - medusa-interfaces@1.2.0
 - @medusajs/medusa-js@1.1.0
 - medusa-payment-klarna@1.2.0
 - medusa-payment-paypal@1.1.0
 - medusa-plugin-algolia@0.1.0
 - medusa-plugin-brightpearl@1.2.0
 - medusa-plugin-meilisearch@0.1.0
 - medusa-plugin-segment@1.2.0
 - medusa-plugin-sendgrid@1.2.0
 - medusa-plugin-slack-notification@1.2.0
 - medusa-react@0.2.0
 - medusa-source-shopify@1.1.0
 - @medusajs/medusa@1.2.0
 2022-02-25 18:53:50 +01:00
olivermrbl a3ecf1b41f chore: install docs deps 2022-02-25 18:53:50 +01:00
olivermrbl c92801413c chore: install docs deps 2022-02-25 18:30:35 +01:00
olivermrbl c16df9383c chore(release): Publish 
- create-medusa-app@0.0.6
 - gatsby-source-medusa@0.0.47
 - @medusajs/medusa-cli@1.1.27
 - medusa-file-minio@1.0.4
 - medusa-file-s3@1.0.12
 - medusa-file-spaces@1.1.37
 - @medusajs/medusa-js@1.0.10
 - medusa-payment-adyen@1.1.39
 - medusa-payment-klarna@1.1.39
 - medusa-payment-manual@1.0.16
 - medusa-payment-paypal@1.0.38
 - medusa-payment-stripe@1.1.38
 - medusa-plugin-add-ons@1.1.37
 - medusa-plugin-brightpearl@1.1.43
 - medusa-plugin-contentful@1.1.40
 - medusa-plugin-economic@1.1.37
 - medusa-plugin-mailchimp@1.1.37
 - medusa-plugin-permissions@1.1.37
 - medusa-plugin-restock-notification@0.0.30
 - medusa-plugin-segment@1.1.40
 - medusa-plugin-sendgrid@1.1.38
 - medusa-plugin-slack-notification@1.1.37
 - medusa-plugin-twilio-sms@1.1.37
 - medusa-plugin-wishlist@1.1.37
 - medusa-react@0.1.3
 - medusa-source-shopify@1.0.3
 - medusa-test-utils@1.1.37
 - @medusajs/medusa@1.1.62
 2022-01-11 16:54:08 +01:00
olivermrbl ec0f2df285 chore(release): Publish 
- gatsby-source-medusa@0.0.46
 - @medusajs/medusa-cli@1.1.26
 - medusa-file-minio@1.0.3
 - medusa-file-s3@1.0.11
 - medusa-file-spaces@1.1.36
 - @medusajs/medusa-js@1.0.9
 - medusa-payment-adyen@1.1.38
 - medusa-payment-klarna@1.1.38
 - medusa-payment-manual@1.0.15
 - medusa-payment-paypal@1.0.37
 - medusa-payment-stripe@1.1.37
 - medusa-plugin-add-ons@1.1.36
 - medusa-plugin-brightpearl@1.1.42
 - medusa-plugin-contentful@1.1.39
 - medusa-plugin-economic@1.1.36
 - medusa-plugin-mailchimp@1.1.36
 - medusa-plugin-permissions@1.1.36
 - medusa-plugin-restock-notification@0.0.29
 - medusa-plugin-segment@1.1.39
 - medusa-plugin-sendgrid@1.1.37
 - medusa-plugin-slack-notification@1.1.36
 - medusa-plugin-twilio-sms@1.1.36
 - medusa-plugin-wishlist@1.1.36
 - medusa-react@0.1.2
 - medusa-source-shopify@1.0.2
 - medusa-test-utils@1.1.36
 - @medusajs/medusa@1.1.61
 2021-12-29 13:02:39 +01:00
olivermrbl abcf43b21c chore: release assist 2021-12-17 15:42:38 +01:00
olivermrbl 3bbd1e8507 chore: release assist 2021-12-17 15:39:27 +01:00
olivermrbl 81a7ff73d0 chore(release): Publish 
- gatsby-source-medusa@0.0.45
 - @medusajs/medusa-cli@1.1.25
 - medusa-file-minio@1.0.2
 - medusa-file-s3@1.0.10
 - medusa-file-spaces@1.1.35
 - @medusajs/medusa-js@1.0.8
 - medusa-payment-adyen@1.1.37
 - medusa-payment-klarna@1.1.37
 - medusa-payment-manual@1.0.14
 - medusa-payment-paypal@1.0.36
 - medusa-payment-stripe@1.1.36
 - medusa-plugin-add-ons@1.1.35
 - medusa-plugin-brightpearl@1.1.41
 - medusa-plugin-contentful@1.1.38
 - medusa-plugin-economic@1.1.35
 - medusa-plugin-mailchimp@1.1.35
 - medusa-plugin-permissions@1.1.35
 - medusa-plugin-restock-notification@0.0.28
 - medusa-plugin-segment@1.1.38
 - medusa-plugin-sendgrid@1.1.36
 - medusa-plugin-slack-notification@1.1.35
 - medusa-plugin-twilio-sms@1.1.35
 - medusa-plugin-wishlist@1.1.35
 - medusa-react@0.1.1
 - medusa-source-shopify@1.0.1
 - medusa-test-utils@1.1.35
 - @medusajs/medusa@1.1.60
 2021-12-17 14:24:00 +01:00
olivermrbl 948f8b2593 chore: release assist 2021-11-22 17:18:27 +01:00
olivermrbl b7329e9083 Merge branch 'develop' of https://github.com/medusajs/medusa into develop 2021-11-22 13:41:20 +01:00
olivermrbl 72c5030da3 Merge branch 'master' into develop 2021-11-22 13:40:55 +01:00
olivermrbl 84343c88e3 chore(release): Publish 
- medusa-payment-stripe@1.1.26
 2021-09-22 13:52:35 +02:00
olivermrbl 1a87a463b4 adds money amount migration 2021-09-05 21:39:00 +02:00
olivermrbl 8fdfc87049 integration tests passing 2021-09-05 21:34:13 +02:00
olivermrbl 692bca8a22 chore(release): Publish 
- medusa-payment-manual@1.0.4
 - medusa-plugin-brightpearl@1.1.30
 - medusa-plugin-restock-notification@0.0.18
 - medusa-plugin-wishlist@1.1.25
 - @medusajs/medusa@1.1.40
 2021-09-02 17:53:22 +02:00
olivermrbl 798dd3c666 Merge branch 'release/next' 2021-08-31 16:18:35 +02:00
olivermrbl 65e97c2c53 chore(release): Publish 
- medusa-payment-manual@1.0.3
 - medusa-plugin-brightpearl@1.1.29
 - medusa-plugin-restock-notification@0.0.17
 - medusa-plugin-wishlist@1.1.24
 - @medusajs/medusa@1.1.39
 2021-08-31 16:17:33 +02:00
olivermrbl d5556176f4 Merge branch 'develop' of https://github.com/medusajs/medusa into develop 2021-08-31 15:11:24 +02:00
olivermrbl 704908f29b chore: wishlish plugin lockfile 2021-08-30 12:23:24 +02:00
olivermrbl b1132eec23 fix: 404 2021-08-26 13:57:30 +02:00
olivermrbl 5150a6b4d9 Merge branch 'feat/add-to-wishlist-extension' of https://github.com/medusajs/medusa into feat/add-to-wishlist-extension 2021-08-26 13:12:24 +02:00
olivermrbl 2c72227244 chore: update 2021-08-26 13:12:21 +02:00
olivermrbl dde3834124 Merge branch 'master' into develop 2021-07-16 14:30:11 +02:00
olivermrbl 62b361ecfd chore(release): Publish 
- @medusajs/medusa@1.1.32
 2021-07-16 10:29:42 +02:00
olivermrbl 80e9001abc Merge branch 'master' into develop 2021-07-02 16:24:56 +02:00
olivermrbl 44d31b4d83 chore(release): Publish 
- babel-preset-medusa-package@1.1.10
 - @medusajs/medusa-cli@1.1.11
 - medusa-core-utils@1.1.16
 - medusa-dev-cli@0.0.15
 - medusa-file-spaces@1.1.19
 - medusa-fulfillment-manual@1.1.16
 - medusa-fulfillment-webshipper@1.1.20
 - medusa-interfaces@1.1.17
 - medusa-payment-adyen@1.1.21
 - medusa-payment-klarna@1.1.21
 - medusa-payment-paypal@1.0.20
 - medusa-payment-stripe@1.1.19
 - medusa-plugin-add-ons@1.1.19
 - medusa-plugin-brightpearl@1.1.24
 - medusa-plugin-contentful@1.1.21
 - medusa-plugin-discount-generator@1.1.10
 - medusa-plugin-economic@1.1.19
 - medusa-plugin-ip-lookup@1.1.10
 - medusa-plugin-mailchimp@1.1.19
 - medusa-plugin-permissions@1.1.19
 - medusa-plugin-restock-notification@0.0.12
 - medusa-plugin-segment@1.1.22
 - medusa-plugin-sendgrid@1.1.20
 - medusa-plugin-slack-notification@1.1.19
 - medusa-plugin-twilio-sms@1.1.19
 - medusa-plugin-wishlist@1.1.19
 - medusa-test-utils@1.1.19
 - @medusajs/medusa@1.1.29
 2021-07-02 14:45:24 +02:00
olivermrbl af5d9a2765 --amend 2021-06-09 10:30:00 +02:00
olivermrbl 09a51ea3fd fix merge conflicts 2021-06-09 10:29:19 +02:00
olivermrbl 3e00f5c120 fix merge conflicts 2021-06-09 10:29:01 +02:00
olivermrbl 70a27f55f8 chore: bump dependencies 2021-06-09 10:28:24 +02:00
olivermrbl eb0a4afd79 hotfix: Add shipping method to draft order 2021-06-08 16:55:53 +02:00
olivermrbl 71c995ecfb completed_at allow null 2021-06-08 08:31:51 +02:00
olivermrbl c8b134c488 merges migration files 2021-06-08 08:24:00 +02:00
olivermrbl 1edee26e7b replace order count 2021-06-07 22:22:35 +02:00
olivermrbl 77a84af35c use correct order listing 2021-06-07 21:39:21 +02:00
olivermrbl 48af705478 fix draftorder completed at column 2021-06-07 18:20:18 +02:00
olivermrbl c0f2d629ab PR Review fixes 2021-06-07 15:23:41 +02:00
olivermrbl e79b8f6494 add update-line-item on draft orders 2021-06-04 14:33:51 +02:00
olivermrbl 862f8282c4 fix merge conflicts 2021-06-03 11:25:18 +02:00
olivermrbl d6d7b30a52 chore: bump babel cli 2021-06-02 18:47:20 +02:00
olivermrbl 0516bf7a5f minor test fix 2021-06-02 18:39:22 +02:00
olivermrbl 8333a547aa add retrieve discount by code 2021-06-02 08:09:04 +02:00
olivermrbl b560f1197b clean up lock files 2021-05-26 14:43:10 +02:00
olivermrbl 117da8ebd8 clean up 2021-05-26 14:08:43 +02:00
olivermrbl e3343f74a7 fix merge conflicts from develop 2021-05-25 15:44:26 +02:00
olivermrbl 23b9066159 Merge branch 'hotfix/claim-return-shipping' into develop 2021-04-29 15:47:32 +02:00
olivermrbl cb0fb757a0 hotfix: Claim return shipping 2021-04-28 16:45:48 +02:00
olivermrbl 348d1c4997 chore(release): Publish 
- babel-preset-medusa-package@1.1.2
 - @medusajs/medusa-cli@1.1.6
 - medusa-core-utils@1.1.8
 - medusa-dev-cli@0.0.7
 - medusa-file-spaces@1.1.11
 - medusa-fulfillment-manual@1.1.8
 - medusa-fulfillment-webshipper@1.1.11
 - medusa-interfaces@1.1.9
 - medusa-payment-adyen@1.1.11
 - medusa-payment-klarna@1.1.12
 - medusa-payment-paypal@1.0.11
 - medusa-payment-stripe@1.1.11
 - medusa-plugin-add-ons@1.1.11
 - medusa-plugin-brightpearl@1.1.14
 - medusa-plugin-contentful@1.1.12
 - medusa-plugin-discount-generator@1.1.2
 - medusa-plugin-economic@1.1.11
 - medusa-plugin-ip-lookup@1.1.2
 - medusa-plugin-mailchimp@1.1.11
 - medusa-plugin-permissions@1.1.11
 - medusa-plugin-restock-notification@0.0.5
 - medusa-plugin-segment@1.1.14
 - medusa-plugin-sendgrid@1.1.12
 - medusa-plugin-slack-notification@1.1.11
 - medusa-plugin-twilio-sms@1.1.11
 - medusa-plugin-wishlist@1.1.11
 - medusa-test-utils@1.1.11
 - @medusajs/medusa@1.1.21
 2021-04-20 12:59:39 +02:00
olivermrbl 66f5d9d33e chore(release): Publish 
- babel-preset-medusa-package@1.1.1
 - @medusajs/medusa-cli@1.1.5
 - medusa-core-utils@1.1.7
 - medusa-dev-cli@0.0.6
 - medusa-file-spaces@1.1.10
 - medusa-fulfillment-manual@1.1.7
 - medusa-fulfillment-webshipper@1.1.10
 - medusa-interfaces@1.1.8
 - medusa-payment-adyen@1.1.10
 - medusa-payment-klarna@1.1.11
 - medusa-payment-paypal@1.0.10
 - medusa-payment-stripe@1.1.10
 - medusa-plugin-add-ons@1.1.10
 - medusa-plugin-brightpearl@1.1.13
 - medusa-plugin-contentful@1.1.11
 - medusa-plugin-discount-generator@1.1.1
 - medusa-plugin-economic@1.1.10
 - medusa-plugin-ip-lookup@1.1.1
 - medusa-plugin-mailchimp@1.1.10
 - medusa-plugin-permissions@1.1.10
 - medusa-plugin-restock-notification@0.0.4
 - medusa-plugin-segment@1.1.13
 - medusa-plugin-sendgrid@1.1.11
 - medusa-plugin-slack-notification@1.1.10
 - medusa-plugin-twilio-sms@1.1.10
 - medusa-plugin-wishlist@1.1.10
 - medusa-test-utils@1.1.10
 - @medusajs/medusa@1.1.20
 2021-04-20 12:58:36 +02:00
olivermrbl b1bd2dfeb4 chore: version bumps 2021-04-20 11:13:59 +02:00
olivermrbl 982da259ed chore: version bumps 2021-04-20 11:10:45 +02:00
olivermrbl 4ce77d5229 Merge branch 'master' into develop 2021-04-20 10:57:56 +02:00
olivermrbl 3f884e8b3f chore(release): Publish 
- medusa-plugin-brightpearl@1.1.13
 2021-04-14 12:33:49 +02:00
olivermrbl 4e025e3501 hotfix(medusa-plugin-brightpearl): Use order id in sales order endpoint 2021-04-14 11:37:11 +02:00
olivermrbl 4e7b4b3a8a Merge branch 'fix/discount-usage' into develop 2021-04-09 09:11:19 +02:00
olivermrbl 94c08c07c5 chore(release): Publish 
- medusa-core-utils@1.1.5
 - medusa-file-spaces@1.1.8
 - medusa-fulfillment-manual@1.1.5
 - medusa-fulfillment-webshipper@1.1.8
 - medusa-interfaces@1.1.6
 - medusa-payment-adyen@1.1.8
 - medusa-payment-klarna@1.1.9
 - medusa-payment-paypal@1.0.8
 - medusa-payment-stripe@1.1.8
 - medusa-plugin-add-ons@1.1.8
 - medusa-plugin-brightpearl@1.1.11
 - medusa-plugin-contentful@1.1.9
 - medusa-plugin-economic@1.1.8
 - medusa-plugin-mailchimp@1.1.8
 - medusa-plugin-permissions@1.1.8
 - medusa-plugin-segment@1.1.11
 - medusa-plugin-sendgrid@1.1.9
 - medusa-plugin-slack-notification@1.1.8
 - medusa-plugin-twilio-sms@1.1.8
 - medusa-plugin-wishlist@1.1.8
 - medusa-test-utils@1.1.8
 - @medusajs/medusa@1.1.18
 2021-04-09 09:08:02 +02:00
olivermrbl 7e4fec0e4e Merge branch 'master' into fix/discount-usage 2021-04-09 08:39:24 +02:00
olivermrbl 94da59b214 Merge branch 'hotfix/contentful-image-url' into develop 2021-04-09 08:29:57 +02:00
olivermrbl 8066a0e717 hotfix(medusa-plugin-contentful): Fixes image assets 2021-04-08 16:20:36 +02:00
olivermrbl f08511166a pr comment fix 2021-04-07 12:22:40 +02:00
olivermrbl 993766e5a1 Merge branch 'master' into fix/discount-usage 2021-04-07 12:22:09 +02:00
olivermrbl 01f184b9b0 small fix 2021-03-29 12:29:35 +02:00
olivermrbl 3b801e7486 fix nullable description 2021-03-29 11:45:30 +02:00
olivermrbl 38521169c0 add integration tests 2021-03-29 10:28:14 +02:00
olivermrbl d9cd52a177 fix(medusa): Move discount usage from rule to discount 2021-03-29 10:15:41 +02:00
olivermrbl 3d9cf55e0d chore(release): Publish 
- @medusajs/medusa@1.1.15
 2021-03-18 10:10:38 +01:00
olivermrbl 7872d37c04 fix merge conflicts 2021-03-17 14:50:07 +01:00
olivermrbl 8fc6b26cb8 pr review fixes 2021-03-17 10:32:11 +01:00
olivermrbl fa2c6f9beb fix merge conflicts 2021-03-17 08:52:00 +01:00